[PATCH] swap: scan_swap_map drop swap_device_lock

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

diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 0c607c1388f441cb113362b08d345e69ef1927e9..bd9ed9b0247b1d48de85680c7bed66e04b1787a2 100644 (file)
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -7,11 +7,10 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: file.c,v 1.99 2004/11/16 20:36:11 dwmw2 Exp $
+ * $Id: file.c,v 1.102 2005/07/06 12:13:09 dwmw2 Exp $
  *
  */
 
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
@@ -51,9 +50,7 @@ struct file_operations jffs2_file_operations =
        .ioctl =        jffs2_ioctl,
        .mmap =         generic_file_readonly_mmap,
        .fsync =        jffs2_fsync,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,29)
        .sendfile =     generic_file_sendfile
-#endif
 };
 
 /* jffs2_file_inode_operations */
@@ -79,8 +76,7 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)
 
        D2(printk(KERN_DEBUG "jffs2_do_readpage_nolock(): ino #%lu, page at offset 0x%lx\n", inode->i_ino, pg->index << PAGE_CACHE_SHIFT));
 
-       if (!PageLocked(pg))
-                PAGE_BUG(pg);
+       BUG_ON(!PageLocked(pg));
 
        pg_buf = kmap(pg);
        /* FIXME: Can kmap fail? */