Automerge

fs/jfs/inode.c

@@ -19,7 +19,6 @@
 
 #include <linux/fs.h>
 #include <linux/locks.h>
-#include <linux/slab.h>
 #include "jfs_incore.h"
 #include "jfs_filsys.h"
 #include "jfs_imap.h"

fs/jfs/jfs_dmap.c

@@ -30,7 +30,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/slab.h>
 #include "jfs_incore.h"
 #include "jfs_dmap.h"
 #include "jfs_imap.h"

fs/jfs/jfs_dtree.c

@@ -104,7 +104,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/slab.h>
 #include <linux/locks.h>
 #include "jfs_incore.h"
 #include "jfs_superblock.h"

fs/jfs/jfs_imap.c

@@ -50,7 +50,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/slab.h>
 #include <linux/locks.h>
 #include "jfs_incore.h"
 #include "jfs_filsys.h"

fs/jfs/jfs_logmgr.c

@@ -62,7 +62,6 @@
 
 #include <linux/fs.h>
 #include <linux/locks.h>
-#include <linux/slab.h>
 #include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/smp_lock.h>

fs/jfs/namei.c

@@ -26,6 +26,7 @@
  */
 
 #include <linux/fs.h>
+#include <linux/locks.h>
 #include "jfs_incore.h"
 #include "jfs_inode.h"
 #include "jfs_dinode.h"
@@ -33,8 +34,6 @@
 #include "jfs_unicode.h"
 #include "jfs_metapage.h"
 #include "jfs_debug.h"
-#include <linux/locks.h>
-#include <linux/slab.h>
 
 extern struct inode_operations jfs_file_inode_operations;
 extern struct inode_operations jfs_symlink_inode_operations;

fs/jfs/super.c

@@ -21,7 +21,6 @@
 #include <linux/locks.h>
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/slab.h>
 #include <linux/completion.h>
 #include <asm/uaccess.h>
 #include "jfs_incore.h"