Merge HEAD from ../scsi-misc-2.6-old

[linux-2.6] / fs / afs / file.c

diff --git a/fs/afs/file.c b/fs/afs/file.c
index 6b6bb7c8abf666d45b1bc3bb54b7ad5938aec97d..0d576987ec670dae2349d0586defdeb58dc52356 100644 (file)
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -29,7 +29,7 @@ static int afs_file_release(struct inode *inode, struct file *file);
 
 static int afs_file_readpage(struct file *file, struct page *page);
 static int afs_file_invalidatepage(struct page *page, unsigned long offset);
-static int afs_file_releasepage(struct page *page, int gfp_flags);
+static int afs_file_releasepage(struct page *page, gfp_t gfp_flags);
 
 static ssize_t afs_file_write(struct file *file, const char __user *buf,
                              size_t size, loff_t *off);
@@ -131,8 +131,7 @@ static int afs_file_readpage(struct file *file, struct page *page)
 
        vnode = AFS_FS_I(inode);
 
-       if (!PageLocked(page))
-               PAGE_BUG(page);
+       BUG_ON(!PageLocked(page));
 
        ret = -ESTALE;
        if (vnode->flags & AFS_VNODE_DELETED)
@@ -280,7 +279,7 @@ static int afs_file_invalidatepage(struct page *page, unsigned long offset)
 /*
  * release a page and cleanup its private data
  */
-static int afs_file_releasepage(struct page *page, int gfp_flags)
+static int afs_file_releasepage(struct page *page, gfp_t gfp_flags)
 {
        struct cachefs_page *pageio;