Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-serial.git

[linux-2.6] / fs / udf / inode.c

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 0506e117378450ed524253b5c933bbed3dd27696..3d68de39fad6297dbfaed66e9f02b57e21ca604f 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -167,8 +167,8 @@ void udf_expand_file_adinicb(struct inode * inode, int newsize, int * err)
        }
 
        page = grab_cache_page(inode->i_mapping, 0);
-       if (!PageLocked(page))
-               PAGE_BUG(page);
+       BUG_ON(!PageLocked(page));
+
        if (!PageUptodate(page))
        {
                kaddr = kmap(page);