get rid of <linux/locks.h>

PATCH New Christoph Hellwig 1 participant 1 message May 20, 2002

Subsystems (24)

Networking Memory management Media (V4L/DVB) VFS +20 more subsystems

lore

Share & tools

lore

Christoph Hellwig

author

2002-05-20 16:30 UTC #0 lore raw

PATCH 1/1 get rid of <linux/locks.h>

The lock.h header contained some hand-crafted lcoking routines from the pre-SMP days. In 2.5 only lock_super/unlock_super are left, guarded by a number of completly unrelated (!) includes.

This patch moves lock_super/unlock_super to fs.h, which defined struct super_block that is needed for those to operate it, removes locks.h and updates all caller to not include it and add the missing, previously nested includes where needed.

===== drivers/block/DAC960.c 1.26 vs edited =====

drivers/block/DAC960.c +0 -1

@@ -35,7 +35,6 @@
 #include <linux/blkpg.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/locks.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>

===== drivers/block/block_ioctl.c 1.7 vs edited =====

drivers/block/block_ioctl.c +0 -1

@@ -21,7 +21,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/config.h>
-#include <linux/locks.h>
 #include <linux/swap.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>

===== drivers/block/cpqarray.h 1.5 vs edited =====

drivers/block/cpqarray.h +0 -1

@@ -27,7 +27,6 @@
 
 #ifdef __KERNEL__
 #include <linux/blkdev.h>
-#include <linux/locks.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/timer.h>

===== drivers/block/ll_rw_blk.c 1.66 vs edited =====

drivers/block/ll_rw_blk.c +0 -1

@@ -18,7 +18,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/config.h>
-#include <linux/locks.h>
 #include <linux/mm.h>
 #include <linux/swap.h>
 #include <linux/init.h>

===== drivers/isdn/capi/capifs.c 1.16 vs edited =====

drivers/isdn/capi/capifs.c +0 -1

@@ -21,7 +21,6 @@
 #include <linux/init.h>
 #include <linux/kdev_t.h>
 #include <linux/kernel.h>
-#include <linux/locks.h>
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/ctype.h>

===== drivers/isdn/capi/kcapi.c 1.31 vs edited =====

drivers/isdn/capi/kcapi.c +0 -1

@@ -26,7 +26,6 @@
 #include <linux/tqueue.h>
 #include <linux/capi.h>
 #include <linux/kernelcapi.h>
-#include <linux/locks.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include <linux/isdn/capicmd.h>

===== drivers/md/lvm.c 1.26 vs edited =====

drivers/md/lvm.c +0 -1

@@ -212,7 +212,6 @@
 #include <linux/proc_fs.h>
 #include <linux/blkdev.h>
 #include <linux/genhd.h>
-#include <linux/locks.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/smp_lock.h>
 #include <asm/ioctl.h>

===== drivers/md/raid5.c 1.21 vs edited =====

drivers/md/raid5.c +0 -1

@@ -18,7 +18,6 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/locks.h>
 #include <linux/slab.h>
 #include <linux/raid/raid5.h>
 #include <asm/bitops.h>

===== drivers/media/video/i2c-old.c 1.3 vs edited =====

drivers/media/video/i2c-old.c +0 -1

@@ -12,7 +12,6 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/delay.h>
-#include <linux/locks.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/i2c-old.h>

===== fs/binfmt_em86.c 1.3 vs edited =====

fs/binfmt_em86.c +0 -1

@@ -12,7 +12,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/slab.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 #include <linux/binfmts.h>
 #include <linux/elf.h>

===== fs/block_dev.c 1.56 vs edited =====

fs/block_dev.c +0 -1

@@ -8,7 +8,6 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/locks.h>
 #include <linux/fcntl.h>
 #include <linux/slab.h>
 #include <linux/kmod.h>

===== fs/buffer.c 1.101 vs edited =====

fs/buffer.c +0 -1

@@ -23,7 +23,6 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 #include <linux/blkdev.h>
 #include <linux/file.h>

===== fs/super.c 1.70 vs edited =====

fs/super.c +0 -1

@@ -22,7 +22,6 @@
 
 #include <linux/config.h>
 #include <linux/slab.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/acct.h>

===== fs/adfs/inode.c 1.10 vs edited =====

fs/adfs/inode.c +0 -1

@@ -14,7 +14,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
 #include <linux/module.h>

===== fs/adfs/super.c 1.14 vs edited =====

fs/adfs/super.c +0 -1

@@ -16,7 +16,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/init.h>
 
 #include <asm/bitops.h>

===== fs/affs/amigaffs.c 1.11 vs edited =====

fs/affs/amigaffs.c +0 -1

@@ -13,7 +13,6 @@
 #include <linux/time.h>
 #include <linux/affs_fs.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/mm.h>
 #include <linux/amigaffs.h>

===== fs/affs/bitmap.c 1.8 vs edited =====

fs/affs/bitmap.c +0 -1

@@ -13,7 +13,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/bitops.h>
 #include <linux/amigaffs.h>

===== fs/affs/file.c 1.17 vs edited =====

fs/affs/file.c +0 -1

@@ -22,7 +22,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 #include <linux/dirent.h>
 #include <linux/fs.h>

===== fs/affs/inode.c 1.13 vs edited =====

fs/affs/inode.c +0 -1

@@ -20,7 +20,6 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/genhd.h>
 #include <linux/amigaffs.h>
 #include <linux/major.h>

===== fs/affs/namei.c 1.16 vs edited =====

fs/affs/namei.c +0 -1

@@ -14,7 +14,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/fcntl.h>
-#include <linux/locks.h>
 #include <linux/amigaffs.h>
 #include <linux/smp_lock.h>
 #include <asm/uaccess.h>

===== fs/affs/super.c 1.23 vs edited =====

fs/affs/super.c +0 -1

@@ -20,7 +20,6 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/genhd.h>
 #include <linux/amigaffs.h>
 #include <linux/major.h>

===== fs/autofs/inode.c 1.9 vs edited =====

fs/autofs/inode.c +0 -1

@@ -14,7 +14,6 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/file.h>
-#include <linux/locks.h>
 #include <asm/bitops.h>
 #include "autofs_i.h"
 #define __NO_VERSION__

===== fs/autofs4/inode.c 1.7 vs edited =====

fs/autofs4/inode.c +1 -1

@@ -13,7 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/file.h>
-#include <linux/locks.h>
+#include <linux/pagemap.h>
 #include <asm/bitops.h>
 #include "autofs_i.h"
 #define __NO_VERSION__

===== fs/bfs/dir.c 1.14 vs edited =====

fs/bfs/dir.c +0 -1

@@ -7,7 +7,6 @@
 #include <linux/time.h>
 #include <linux/string.h>
 #include <linux/bfs_fs.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 
 #include "bfs_defs.h"

===== fs/bfs/file.c 1.6 vs edited =====

fs/bfs/file.c +0 -1

@@ -5,7 +5,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/locks.h>
 #include <linux/bfs_fs.h>
 #include <linux/smp_lock.h>
 #include "bfs_defs.h"

===== fs/bfs/inode.c 1.13 vs edited =====

fs/bfs/inode.c +0 -1

@@ -9,7 +9,6 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/locks.h>
 #include <linux/bfs_fs.h>
 #include <linux/smp_lock.h>

===== fs/coda/cache.c 1.6 vs edited =====

fs/coda/cache.c +0 -1

@@ -13,7 +13,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
 #include <linux/list.h>

===== fs/coda/coda_linux.c 1.5 vs edited =====

fs/coda/coda_linux.c +0 -1

@@ -14,7 +14,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>

===== fs/coda/dir.c 1.15 vs edited =====

fs/coda/dir.c +0 -1

@@ -15,7 +15,6 @@
 #include <linux/file.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/string.h>
 #include <linux/smp_lock.h>

===== fs/coda/file.c 1.8 vs edited =====

fs/coda/file.c +0 -1

@@ -14,7 +14,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <asm/uaccess.h>

===== fs/coda/inode.c 1.15 vs edited =====

fs/coda/inode.c +0 -1

@@ -15,7 +15,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/unistd.h>
 #include <linux/smp_lock.h>
 #include <linux/file.h>

===== fs/coda/pioctl.c 1.6 vs edited =====

fs/coda/pioctl.c +0 -1

@@ -13,7 +13,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/string.h>
 #define __NO_VERSION__
 #include <linux/module.h>

===== fs/coda/symlink.c 1.4 vs edited =====

fs/coda/symlink.c +1 -1

@@ -13,7 +13,7 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
+#include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 
 #include <linux/coda.h>

===== fs/coda/upcall.c 1.9 vs edited =====

fs/coda/upcall.c +0 -1

@@ -26,7 +26,6 @@
 #include <linux/file.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/string.h>
 #include <asm/uaccess.h>
 #include <linux/vmalloc.h>

===== fs/cramfs/inode.c 1.20 vs edited =====

fs/cramfs/inode.c +0 -1

@@ -16,7 +16,6 @@
 #include <linux/pagemap.h>
 #include <linux/init.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/blkdev.h>
 #include <linux/cramfs_fs.h>
 #include <linux/smp_lock.h>

===== fs/devpts/inode.c 1.10 vs edited =====

fs/devpts/inode.c +0 -1

@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/kdev_t.h>
 #include <linux/kernel.h>
-#include <linux/locks.h>
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/stat.h>

===== fs/efs/super.c 1.9 vs edited =====

fs/efs/super.c +0 -1

@@ -8,7 +8,6 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/locks.h>
 #include <linux/efs_fs.h>
 #include <linux/efs_vh.h>
 #include <linux/efs_fs_sb.h>

===== fs/ext2/balloc.c 1.17 vs edited =====

fs/ext2/balloc.c +0 -1

@@ -13,7 +13,6 @@
 
 #include <linux/config.h>
 #include "ext2.h"
-#include <linux/locks.h>
 #include <linux/quotaops.h>
 
 /*

===== fs/ext2/fsync.c 1.6 vs edited =====

fs/ext2/fsync.c +0 -1

@@ -23,7 +23,6 @@
  */
 
 #include "ext2.h"
-#include <linux/locks.h>
 #include <linux/smp_lock.h>

===== fs/ext2/ialloc.c 1.14 vs edited =====

fs/ext2/ialloc.c +0 -1

@@ -14,7 +14,6 @@
 
 #include <linux/config.h>
 #include "ext2.h"
-#include <linux/locks.h>
 #include <linux/quotaops.h>

===== fs/ext2/inode.c 1.30 vs edited =====

fs/ext2/inode.c +1 -1

@@ -23,10 +23,10 @@
  */
 
 #include "ext2.h"
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 #include <linux/time.h>
 #include <linux/highuid.h>
+#include <linux/pagemap.h>
 #include <linux/quotaops.h>
 #include <linux/module.h>

===== fs/ext2/super.c 1.23 vs edited =====

fs/ext2/super.c +0 -1

@@ -22,7 +22,6 @@
 #include "ext2.h"
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/locks.h>
 #include <linux/blkdev.h>
 #include <linux/random.h>
 #include <linux/smp_lock.h>

===== fs/ext3/balloc.c 1.4 vs edited =====

fs/ext3/balloc.c +0 -1

@@ -17,7 +17,6 @@
 #include <linux/jbd.h>
 #include <linux/ext3_fs.h>
 #include <linux/ext3_jbd.h>
-#include <linux/locks.h>
 #include <linux/quotaops.h>
 
 /*

===== fs/ext3/file.c 1.3 vs edited =====

fs/ext3/file.c +0 -1

@@ -20,7 +20,6 @@
 
 #include <linux/time.h>
 #include <linux/fs.h>
-#include <linux/locks.h>
 #include <linux/jbd.h>
 #include <linux/ext3_fs.h>
 #include <linux/ext3_jbd.h>

===== fs/ext3/ialloc.c 1.8 vs edited =====

fs/ext3/ialloc.c +0 -1

@@ -19,7 +19,6 @@
 #include <linux/ext3_jbd.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/quotaops.h>
 
 #include <asm/bitops.h>

===== fs/ext3/inode.c 1.18 vs edited =====

fs/ext3/inode.c +3 -2

@@ -22,15 +22,16 @@
  *  Assorted race fixes, rewrite of ext3_get_block() by Al Viro, 2000
  */
 
+#include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/time.h>
 #include <linux/ext3_jbd.h>
 #include <linux/jbd.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 #include <linux/highuid.h>
+#include <linux/pagemap.h>
 #include <linux/quotaops.h>
-#include <linux/module.h>
+#include <linux/string.h>
 
 /*
  * SEARCH_FROM_ZERO forces each block allocation to search from the start

===== fs/ext3/namei.c 1.13 vs edited =====

fs/ext3/namei.c +0 -1

@@ -26,7 +26,6 @@
 #include <linux/fcntl.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/quotaops.h>
 #include <linux/smp_lock.h>

===== fs/ext3/super.c 1.20 vs edited =====

fs/ext3/super.c +0 -1

@@ -26,7 +26,6 @@
 #include <linux/ext3_jbd.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/locks.h>
 #include <linux/blkdev.h>
 #include <linux/smp_lock.h>
 #include <asm/uaccess.h>

===== fs/fat/file.c 1.12 vs edited =====

fs/fat/file.c +0 -1

@@ -7,7 +7,6 @@
  */
 
 #include <linux/time.h>
-#include <linux/locks.h>
 #include <linux/msdos_fs.h>
 #include <linux/fat_cvf.h>
 #include <linux/smp_lock.h>

===== fs/fat/inode.c 1.38 vs edited =====

fs/fat/inode.c +1 -1

@@ -12,11 +12,11 @@
 
 #include <linux/module.h>
 #include <linux/time.h>
-#include <linux/locks.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/msdos_fs.h>
 #include <linux/fat_cvf.h>
+#include <linux/pagemap.h>
 
 //#include <asm/uaccess.h>
 #include <asm/unaligned.h>

===== fs/hpfs/file.c 1.8 vs edited =====

fs/hpfs/file.c +1 -0

@@ -9,6 +9,7 @@
 #include <linux/string.h>
 #include <linux/time.h>
 #include <linux/smp_lock.h>
+#include <linux/pagemap.h>
 #include "hpfs_fn.h"
 
 #define BLOCKS(size) (((size) + 511) >> 9)

===== fs/hpfs/hpfs_fn.h 1.6 vs edited =====

fs/hpfs/hpfs_fn.h +0 -1

@@ -16,7 +16,6 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/time.h>
-#include <linux/locks.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <asm/bitops.h>

===== fs/hpfs/inode.c 1.8 vs edited =====

fs/hpfs/inode.c +1 -0

@@ -6,6 +6,7 @@
  *  inode VFS functions
  */
 
+#include <linux/fs.h>
 #include <linux/time.h>
 #include <linux/smp_lock.h>
 #include "hpfs_fn.h"

===== fs/hpfs/namei.c 1.12 vs edited =====

fs/hpfs/namei.c +1 -0

@@ -6,6 +6,7 @@
  *  adding & removing files & directories
  */
 
+#include <linux/pagemap.h>
 #include <linux/string.h>
 #include "hpfs_fn.h"

===== fs/intermezzo/cache.c 1.4 vs edited =====

fs/intermezzo/cache.c +0 -1

@@ -22,7 +22,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>

===== fs/intermezzo/dcache.c 1.4 vs edited =====

fs/intermezzo/dcache.c +0 -1

@@ -14,7 +14,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>

===== fs/intermezzo/dir.c 1.5 vs edited =====

fs/intermezzo/dir.c +0 -1

@@ -24,7 +24,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #define __NO_VERSION__

===== fs/intermezzo/ext_attr.c 1.3 vs edited =====

fs/intermezzo/ext_attr.c +0 -1

@@ -14,7 +14,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/unistd.h>
 
 #include <asm/system.h>

===== fs/intermezzo/file.c 1.3 vs edited =====

fs/intermezzo/file.c +0 -1

@@ -31,7 +31,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>

===== fs/intermezzo/inode.c 1.3 vs edited =====

fs/intermezzo/inode.c +0 -2

@@ -15,7 +15,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/unistd.h>
 
 #include <asm/system.h>

@@ -24,7 +23,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/string.h>
 #include <asm/uaccess.h>
 #include <linux/slab.h>

===== fs/intermezzo/journal.c 1.4 vs edited =====

fs/intermezzo/journal.c +0 -1

@@ -13,7 +13,6 @@
 #include <linux/vmalloc.h>
 #include <linux/time.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
 #include <linux/smp_lock.h>

===== fs/intermezzo/journal_ext2.c 1.4 vs edited =====

fs/intermezzo/journal_ext2.c +0 -1

@@ -11,7 +11,6 @@
 #include <linux/vmalloc.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
 #include <linux/ext2_fs.h>

===== fs/intermezzo/journal_ext3.c 1.4 vs edited =====

fs/intermezzo/journal_ext3.c +0 -1

@@ -16,7 +16,6 @@
 #include <linux/vmalloc.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
 #include <linux/smp_lock.h>

===== fs/intermezzo/journal_obdfs.c 1.4 vs edited =====

fs/intermezzo/journal_obdfs.c +0 -1

@@ -16,7 +16,6 @@
 #include <linux/vmalloc.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
 #ifdef CONFIG_OBDFS_FS

===== fs/intermezzo/journal_reiserfs.c 1.4 vs edited =====

fs/intermezzo/journal_reiserfs.c +0 -1

@@ -16,7 +16,6 @@
 #include <linux/stat.h>
 #include <linux/errno.h>
 #include <linux/smp_lock.h>
-#include <linux/locks.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
 #if 0

===== fs/intermezzo/journal_xfs.c 1.4 vs edited =====

fs/intermezzo/journal_xfs.c +0 -1

@@ -11,7 +11,6 @@
 #include <linux/vmalloc.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
 #ifdef CONFIG_FS_XFS

===== fs/intermezzo/methods.c 1.3 vs edited =====

fs/intermezzo/methods.c +0 -1

@@ -23,7 +23,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #define __NO_VERSION__

===== fs/intermezzo/presto.c 1.8 vs edited =====

fs/intermezzo/presto.c +0 -1

@@ -16,7 +16,6 @@
 #include <linux/errno.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
-#include <linux/locks.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
 #include <linux/smp_lock.h>

===== fs/intermezzo/super.c 1.5 vs edited =====

fs/intermezzo/super.c +0 -1

@@ -23,7 +23,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #define __NO_VERSION__

===== fs/intermezzo/upcall.c 1.3 vs edited =====

fs/intermezzo/upcall.c +0 -1

@@ -32,7 +32,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/string.h>
 #include <asm/uaccess.h>
 #include <linux/vmalloc.h>

===== fs/isofs/compress.c 1.8 vs edited =====

fs/isofs/compress.c +0 -1

@@ -26,7 +26,6 @@
 #include <linux/major.h>
 #include <linux/mm.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/cdrom.h>

===== fs/isofs/dir.c 1.7 vs edited =====

fs/isofs/dir.c +0 -1

@@ -19,7 +19,6 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/time.h>
-#include <linux/locks.h>
 #include <linux/config.h>
 #include <linux/smp_lock.h>

===== fs/isofs/inode.c 1.20 vs edited =====

fs/isofs/inode.c +0 -1

@@ -19,7 +19,6 @@
 #include <linux/major.h>
 #include <linux/mm.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/cdrom.h>

===== fs/jbd/checkpoint.c 1.3 vs edited =====

fs/jbd/checkpoint.c +0 -1

@@ -22,7 +22,6 @@
 #include <linux/jbd.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/locks.h>
 
 extern spinlock_t journal_datalist_lock;

===== fs/jbd/commit.c 1.9 vs edited =====

fs/jbd/commit.c +0 -1

@@ -18,7 +18,6 @@
 #include <linux/jbd.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 
 extern spinlock_t journal_datalist_lock;

===== fs/jbd/journal.c 1.13 vs edited =====

fs/jbd/journal.c +1 -1

@@ -28,11 +28,11 @@
 #include <linux/jbd.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <linux/pagemap.h>
 #include <asm/uaccess.h>
 #include <linux/proc_fs.h>

===== fs/jbd/recovery.c 1.7 vs edited =====

fs/jbd/recovery.c +0 -1

@@ -21,7 +21,6 @@
 #include <linux/jbd.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/locks.h>
 #endif
 
 /*

===== fs/jbd/revoke.c 1.7 vs edited =====

fs/jbd/revoke.c +0 -1

@@ -65,7 +65,6 @@
 #include <linux/jbd.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/locks.h>
 #include <linux/list.h>
 #include <linux/smp_lock.h>
 #include <linux/init.h>

===== fs/jbd/transaction.c 1.14 vs edited =====

fs/jbd/transaction.c +1 -1

@@ -22,10 +22,10 @@
 #include <linux/jbd.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/locks.h>
 #include <linux/timer.h>
 #include <linux/smp_lock.h>
 #include <linux/mm.h>
+#include <linux/highmem.h>
 
 extern spinlock_t journal_datalist_lock;

===== fs/jffs/inode-v23.c 1.29 vs edited =====

fs/jffs/inode-v23.c +0 -1

@@ -42,7 +42,6 @@
 #include <linux/slab.h>
 #include <linux/jffs.h>
 #include <linux/fs.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 #include <linux/ioctl.h>
 #include <linux/stat.h>

===== fs/jffs/intrep.c 1.11 vs edited =====

fs/jffs/intrep.c +0 -1

@@ -63,7 +63,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/pagemap.h>
-#include <linux/locks.h>
 #include <asm/semaphore.h>
 #include <asm/byteorder.h>
 #include <linux/version.h>

===== fs/jfs/file.c 1.3 vs edited =====

fs/jfs/file.c +0 -1

@@ -17,7 +17,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/locks.h>
 #include "jfs_incore.h"
 #include "jfs_txnmgr.h"
 #include "jfs_debug.h"

===== fs/jfs/inode.c 1.4 vs edited =====

fs/jfs/inode.c +0 -1

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

===== fs/jfs/jfs_dtree.c 1.9 vs edited =====

fs/jfs/jfs_dtree.c +0 -1

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

===== fs/jfs/jfs_imap.c 1.5 vs edited =====

fs/jfs/jfs_imap.c +0 -1

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

===== fs/jfs/jfs_logmgr.c 1.13 vs edited =====

fs/jfs/jfs_logmgr.c +0 -1

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

===== fs/jfs/jfs_txnmgr.c 1.8 vs edited =====

fs/jfs/jfs_txnmgr.c +0 -1

@@ -43,7 +43,6 @@
 
 
 #include <linux/fs.h>
-#include <linux/locks.h>
 #include <linux/vmalloc.h>
 #include <linux/smp_lock.h>
 #include <linux/completion.h>

===== fs/jfs/jfs_xtree.c 1.2 vs edited =====

fs/jfs/jfs_xtree.c +0 -1

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

===== fs/jfs/namei.c 1.7 vs edited =====

fs/jfs/namei.c +0 -1

@@ -17,7 +17,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/locks.h>
 #include "jfs_incore.h"
 #include "jfs_inode.h"
 #include "jfs_dinode.h"

===== fs/jfs/super.c 1.10 vs edited =====

fs/jfs/super.c +0 -1

@@ -17,7 +17,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/locks.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/completion.h>

===== fs/minix/inode.c 1.22 vs edited =====

fs/minix/inode.c +0 -1

@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include "minix.h"
 #include <linux/slab.h>
-#include <linux/locks.h>
 #include <linux/init.h>
 #include <linux/highuid.h>

===== fs/minix/itree_v1.c 1.6 vs edited =====

fs/minix/itree_v1.c +0 -1

@@ -1,5 +1,4 @@
 #include "minix.h"
-#include <linux/locks.h>
 
 enum {DEPTH = 3, DIRECT = 7};	/* Only double indirect */

===== fs/minix/itree_v2.c 1.6 vs edited =====

fs/minix/itree_v2.c +0 -1

@@ -1,5 +1,4 @@
 #include "minix.h"
-#include <linux/locks.h>
 
 enum {DIRECT = 7, DEPTH = 4};	/* Have triple indirect */

===== fs/ncpfs/dir.c 1.15 vs edited =====

fs/ncpfs/dir.c +0 -1

@@ -20,7 +20,6 @@
 #include <linux/mm.h>
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 
 #include <linux/ncp_fs.h>

===== fs/ncpfs/file.c 1.8 vs edited =====

fs/ncpfs/file.c +0 -1

@@ -15,7 +15,6 @@
 #include <linux/fcntl.h>
 #include <linux/stat.h>
 #include <linux/mm.h>
-#include <linux/locks.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/smp_lock.h>

===== fs/ncpfs/inode.c 1.17 vs edited =====

fs/ncpfs/inode.c +0 -1

@@ -21,7 +21,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/file.h>
 #include <linux/fcntl.h>
 #include <linux/slab.h>

===== fs/nfs/inode.c 1.29 vs edited =====

fs/nfs/inode.c +0 -1

@@ -23,7 +23,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/unistd.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/stats.h>

===== fs/nfsd/nfs3proc.c 1.9 vs edited =====

fs/nfsd/nfs3proc.c +0 -1

@@ -9,7 +9,6 @@
 #include <linux/linkage.h>
 #include <linux/time.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/fs.h>
 #include <linux/ext2_fs.h>
 #include <linux/stat.h>

===== fs/nfsd/nfsproc.c 1.12 vs edited =====

fs/nfsd/nfsproc.c +0 -1

@@ -10,7 +10,6 @@
 #include <linux/linkage.h>
 #include <linux/time.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/fcntl.h>

===== fs/nfsd/vfs.c 1.27 vs edited =====

fs/nfsd/vfs.c +0 -1

@@ -20,7 +20,6 @@
 #include <linux/string.h>
 #include <linux/time.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/fs.h>
 #include <linux/major.h>
 #include <linux/ext2_fs.h>

===== fs/ntfs/aops.c 1.69 vs edited =====

fs/ntfs/aops.c +0 -1

@@ -25,7 +25,6 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/swap.h>
-#include <linux/locks.h>
 
 #include "ntfs.h"

===== fs/ntfs/compress.c 1.40 vs edited =====

fs/ntfs/compress.c +0 -1

@@ -21,7 +21,6 @@
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <linux/locks.h>
 #include <linux/fs.h>
 
 #include "ntfs.h"

===== fs/ntfs/mft.c 1.58 vs edited =====

fs/ntfs/mft.c +0 -1

@@ -20,7 +20,6 @@
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <linux/locks.h>
 #include <linux/swap.h>
 
 #include "ntfs.h"

===== fs/ntfs/super.c 1.99 vs edited =====

fs/ntfs/super.c +0 -1

@@ -23,7 +23,6 @@
 #include <linux/stddef.h>
 #include <linux/init.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/spinlock.h>
 #include <linux/blkdev.h>	/* For bdev_hardsect_size(). */
 #include <linux/backing-dev.h>

===== fs/openpromfs/inode.c 1.12 vs edited =====

fs/openpromfs/inode.c +0 -1

@@ -10,7 +10,6 @@
 #include <linux/string.h>
 #include <linux/fs.h>
 #include <linux/openprom_fs.h>
-#include <linux/locks.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>

===== fs/proc/inode.c 1.12 vs edited =====

fs/proc/inode.c +0 -1

@@ -11,7 +11,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/file.h>
-#include <linux/locks.h>
 #include <linux/limits.h>
 #include <linux/init.h>
 #define __NO_VERSION__

===== fs/qnx4/fsync.c 1.5 vs edited =====

fs/qnx4/fsync.c +0 -1

@@ -15,7 +15,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/fcntl.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 
 #include <linux/fs.h>

===== fs/qnx4/inode.c 1.17 vs edited =====

fs/qnx4/inode.c +1 -1

@@ -20,10 +20,10 @@
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/qnx4_fs.h>
-#include <linux/locks.h>
 #include <linux/init.h>
 #include <linux/highuid.h>
 #include <linux/smp_lock.h>
+#include <linux/pagemap.h>
 
 #include <asm/uaccess.h>

===== fs/qnx4/truncate.c 1.4 vs edited =====

fs/qnx4/truncate.c +0 -1

@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/qnx4_fs.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 #include <asm/uaccess.h>

===== fs/ramfs/inode.c 1.16 vs edited =====

fs/ramfs/inode.c +0 -1

@@ -28,7 +28,6 @@
 #include <linux/pagemap.h>
 #include <linux/init.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>

===== fs/reiserfs/bitmap.c 1.15 vs edited =====

fs/reiserfs/bitmap.c +0 -1

@@ -5,7 +5,6 @@
 #include <linux/config.h>
 #include <linux/time.h>
 #include <linux/reiserfs_fs.h>
-#include <linux/locks.h>
 #include <asm/bitops.h>
 #include <linux/list.h>

===== fs/reiserfs/buffer2.c 1.11 vs edited =====

fs/reiserfs/buffer2.c +0 -1

@@ -4,7 +4,6 @@
 
 #include <linux/config.h>
 #include <linux/time.h>
-#include <linux/locks.h>
 #include <linux/reiserfs_fs.h>
 #include <linux/smp_lock.h>
 #include <linux/kernel_stat.h>

===== fs/reiserfs/fix_node.c 1.20 vs edited =====

fs/reiserfs/fix_node.c +0 -1

@@ -38,7 +38,6 @@
 #include <linux/config.h>
 #include <linux/time.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/reiserfs_fs.h>

===== fs/reiserfs/inode.c 1.56 vs edited =====

fs/reiserfs/inode.c +1 -1

@@ -5,8 +5,8 @@
 #include <linux/config.h>
 #include <linux/time.h>
 #include <linux/reiserfs_fs.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
+#include <linux/pagemap.h>
 #include <asm/uaccess.h>
 #include <asm/unaligned.h>

===== fs/reiserfs/ioctl.c 1.7 vs edited =====

fs/reiserfs/ioctl.c +1 -1

@@ -6,8 +6,8 @@
 #include <linux/reiserfs_fs.h>
 #include <linux/time.h>
 #include <asm/uaccess.h>
+#include <linux/pagemap.h>
 #include <linux/smp_lock.h>
-#include <linux/locks.h>
 
 /*
 ** reiserfs_ioctl - handler for ioctl for inode

===== fs/reiserfs/journal.c 1.39 vs edited =====

fs/reiserfs/journal.c +0 -1

@@ -54,7 +54,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/fcntl.h>
-#include <linux/locks.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/smp_lock.h>

===== fs/reiserfs/objectid.c 1.10 vs edited =====

fs/reiserfs/objectid.c +0 -1

@@ -4,7 +4,6 @@
 
 #include <linux/config.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/random.h>
 #include <linux/time.h>
 #include <linux/reiserfs_fs.h>

===== fs/reiserfs/procfs.c 1.7 vs edited =====

fs/reiserfs/procfs.c +0 -1

@@ -17,7 +17,6 @@
 #include <linux/reiserfs_fs.h>
 #include <linux/reiserfs_fs_sb.h>
 #include <linux/smp_lock.h>
-#include <linux/locks.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>

===== fs/reiserfs/resize.c 1.6 vs edited =====

fs/reiserfs/resize.c +0 -1

@@ -10,7 +10,6 @@
 
 #include <linux/kernel.h>
 #include <linux/vmalloc.h>
-#include <linux/locks.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/reiserfs_fs.h>

===== fs/reiserfs/stree.c 1.27 vs edited =====

fs/reiserfs/stree.c +0 -1

@@ -56,7 +56,6 @@
 #include <linux/config.h>
 #include <linux/time.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/pagemap.h>
 #include <linux/reiserfs_fs.h>
 #include <linux/smp_lock.h>

===== fs/reiserfs/super.c 1.37 vs edited =====

fs/reiserfs/super.c +0 -1

@@ -17,7 +17,6 @@
 #include <asm/uaccess.h>
 #include <linux/reiserfs_fs.h>
 #include <linux/smp_lock.h>
-#include <linux/locks.h>
 #include <linux/init.h>
 #include <linux/blkdev.h>

===== fs/reiserfs/tail_conversion.c 1.19 vs edited =====

fs/reiserfs/tail_conversion.c +0 -1

@@ -6,7 +6,6 @@
 #include <linux/time.h>
 #include <linux/pagemap.h>
 #include <linux/reiserfs_fs.h>
-#include <linux/locks.h>
 
 /* access to tail : when one is going to read tail it must make sure, that is not running.
  direct2indirect and indirect2direct can not run concurrently */

===== fs/romfs/inode.c 1.18 vs edited =====

fs/romfs/inode.c +1 -1

@@ -70,8 +70,8 @@
 #include <linux/slab.h>
 #include <linux/romfs_fs.h>
 #include <linux/fs.h>
-#include <linux/locks.h>
 #include <linux/init.h>
+#include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>

===== fs/smbfs/inode.c 1.20 vs edited =====

fs/smbfs/inode.c +0 -1

@@ -15,7 +15,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/file.h>

===== fs/sysv/balloc.c 1.7 vs edited =====

fs/sysv/balloc.c +0 -1

@@ -19,7 +19,6 @@
  *  This file contains code for allocating/freeing blocks.
  */
 
-#include <linux/locks.h>
 #include "sysv.h"
 
 /* We don't trust the value of

===== fs/sysv/ialloc.c 1.9 vs edited =====

fs/sysv/ialloc.c +1 -1

@@ -21,9 +21,9 @@
 
 #include <linux/kernel.h>
 #include <linux/stddef.h>
+#include <linux/sched.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include "sysv.h"
 
 /* We don't trust the value of

===== fs/sysv/inode.c 1.19 vs edited =====

fs/sysv/inode.c +0 -1

@@ -21,7 +21,6 @@
  *  the superblock.
  */
 
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 #include <linux/highuid.h>
 #include <linux/slab.h>

===== fs/sysv/itree.c 1.10 vs edited =====

fs/sysv/itree.c +0 -1

@@ -5,7 +5,6 @@
  *  AV, Sep--Dec 2000
  */
 
-#include <linux/locks.h>
 #include "sysv.h"
 
 enum {DIRECT = 10, DEPTH = 4};	/* Have triple indirect */

===== fs/udf/balloc.c 1.7 vs edited =====

fs/udf/balloc.c +0 -1

@@ -26,7 +26,6 @@
 
 #include "udfdecl.h"
 
-#include <linux/locks.h>
 #include <linux/quotaops.h>
 #include <asm/bitops.h>

===== fs/udf/file.c 1.8 vs edited =====

fs/udf/file.c +1 -1

@@ -37,8 +37,8 @@
 #include <linux/kernel.h>
 #include <linux/string.h> /* memset */
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
+#include <linux/pagemap.h>
 
 #include "udf_i.h"
 #include "udf_sb.h"

===== fs/udf/fsync.c 1.6 vs edited =====

fs/udf/fsync.c +0 -1

@@ -26,7 +26,6 @@
 #include "udfdecl.h"
 
 #include <linux/fs.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 
 /*

===== fs/udf/ialloc.c 1.7 vs edited =====

fs/udf/ialloc.c +0 -1

@@ -25,7 +25,6 @@
 
 #include "udfdecl.h"
 #include <linux/fs.h>
-#include <linux/locks.h>
 #include <linux/quotaops.h>
 #include <linux/udf_fs.h>

===== fs/udf/inode.c 1.19 vs edited =====

fs/udf/inode.c +1 -1

@@ -34,10 +34,10 @@
  */
 
 #include "udfdecl.h"
-#include <linux/locks.h>
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
 #include <linux/module.h>
+#include <linux/pagemap.h>
 
 #include "udf_i.h"
 #include "udf_sb.h"

===== fs/udf/namei.c 1.18 vs edited =====

fs/udf/namei.c +0 -1

@@ -33,7 +33,6 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/quotaops.h>
-#include <linux/locks.h>
 #include <linux/smp_lock.h>
 
 static inline int udf_match(int len, const char * const name, struct qstr *qs)

===== fs/udf/super.c 1.21 vs edited =====

fs/udf/super.c +0 -1

@@ -50,7 +50,6 @@
 #include <linux/blkdev.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
-#include <linux/locks.h>
 #include <linux/module.h>
 #include <linux/stat.h>
 #include <linux/cdrom.h>

===== fs/ufs/balloc.c 1.11 vs edited =====

fs/ufs/balloc.c +0 -1

@@ -11,7 +11,6 @@
 #include <linux/stat.h>
 #include <linux/time.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/quotaops.h>
 #include <asm/bitops.h>
 #include <asm/byteorder.h>

===== fs/ufs/cylinder.c 1.4 vs edited =====

fs/ufs/cylinder.c +0 -1

@@ -13,7 +13,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 
 #include <asm/bitops.h>
 #include <asm/byteorder.h>

===== fs/ufs/dir.c 1.6 vs edited =====

fs/ufs/dir.c +0 -1

@@ -14,7 +14,6 @@
  */
 
 #include <linux/time.h>
-#include <linux/locks.h>
 #include <linux/fs.h>
 #include <linux/ufs_fs.h>
 #include <linux/smp_lock.h>

===== fs/ufs/file.c 1.6 vs edited =====

fs/ufs/file.c +0 -1

@@ -32,7 +32,6 @@
 #include <linux/fcntl.h>
 #include <linux/time.h>
 #include <linux/stat.h>
-#include <linux/locks.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>

===== fs/ufs/ialloc.c 1.6 vs edited =====

fs/ufs/ialloc.c +0 -1

@@ -25,7 +25,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/quotaops.h>
 #include <asm/bitops.h>
 #include <asm/byteorder.h>

===== fs/ufs/inode.c 1.10 vs edited =====

fs/ufs/inode.c +0 -1

@@ -34,7 +34,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/mm.h>
 #include <linux/smp_lock.h>

===== fs/ufs/super.c 1.20 vs edited =====

fs/ufs/super.c +0 -1

@@ -77,7 +77,6 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>

===== fs/ufs/truncate.c 1.10 vs edited =====

fs/ufs/truncate.c +0 -1

@@ -35,7 +35,6 @@
 #include <linux/fcntl.h>
 #include <linux/time.h>
 #include <linux/stat.h>
-#include <linux/locks.h>
 #include <linux/string.h>
 #include <linux/smp_lock.h>

===== fs/ufs/util.c 1.7 vs edited =====

fs/ufs/util.c +0 -1

@@ -8,7 +8,6 @@
  
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/locks.h>
 #include <linux/ufs_fs.h>
 
 #include "swab.h"

===== include/linux/amigaffs.h 1.9 vs edited =====

include/linux/amigaffs.h +0 -1

@@ -2,7 +2,6 @@
 #define AMIGAFFS_H
 
 #include <linux/types.h>
-#include <linux/locks.h>
 
 #include <asm/byteorder.h>

===== include/linux/blk.h 1.18 vs edited =====

include/linux/blk.h +0 -1

@@ -3,7 +3,6 @@
 
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
-#include <linux/locks.h>
 #include <linux/config.h>
 #include <linux/spinlock.h>
 #include <linux/compiler.h>

===== include/linux/fs.h 1.114 vs edited =====

include/linux/fs.h +13 -0

@@ -662,6 +662,19 @@
 };
 
 /*
+ * Superblock locking.
+ */
+static inline void lock_super(struct super_block * sb)
+{
+	down(&sb->s_lock);
+}
+
+static inline void unlock_super(struct super_block * sb)
+{
+	up(&sb->s_lock);
+}
+
+/*
  * VFS helper functions..
  */
 extern int vfs_create(struct inode *, struct dentry *, int);

===== include/linux/hfs_sysdep.h 1.5 vs edited =====

include/linux/hfs_sysdep.h +1 -1

@@ -19,8 +19,8 @@
 
 #include <linux/slab.h>
 #include <linux/types.h>
-#include <linux/locks.h>
 #include <linux/fs.h>
+#include <linux/sched.h>
 
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>

===== include/linux/nbd.h 1.7 vs edited =====

include/linux/nbd.h +0 -1

@@ -22,7 +22,6 @@
 
 #ifdef MAJOR_NR
 
-#include <linux/locks.h>
 #include <asm/semaphore.h>
 
 #define LOCAL_END_REQUEST

===== include/linux/swap.h 1.42 vs edited =====

include/linux/swap.h +1 -0

@@ -91,6 +91,7 @@
 	int next;			/* next entry on swap list */
 };
 
+struct inode;
 extern int nr_swap_pages;
 
 /* Swap 50% full? Release swapcache more aggressively.. */

===== include/linux/ufs_fs.h 1.4 vs edited =====

include/linux/ufs_fs.h +1 -0

@@ -31,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/time.h>
 #include <linux/stat.h>
+#include <linux/fs.h>
 
 #define UFS_BBLOCK 0
 #define UFS_BBSIZE 8192

===== include/linux/raid/md.h 1.9 vs edited =====

include/linux/raid/md.h +0 -1

@@ -31,7 +31,6 @@
 #include <linux/delay.h>
 #include <net/checksum.h>
 #include <linux/random.h>
-#include <linux/locks.h>
 #include <linux/kernel_stat.h>
 #include <asm/io.h>
 #include <linux/completion.h>

===== kernel/ksyms.c 1.85 vs edited =====

kernel/ksyms.c +0 -1

@@ -21,7 +21,6 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/serial.h>
-#include <linux/locks.h>
 #include <linux/delay.h>
 #include <linux/random.h>
 #include <linux/reboot.h>

===== mm/page_io.c 1.13 vs edited =====

mm/page_io.c +1 -1

@@ -12,8 +12,8 @@
 
 #include <linux/mm.h>
 #include <linux/kernel_stat.h>
+#include <linux/pagemap.h>
 #include <linux/swap.h>
-#include <linux/locks.h>
 #include <linux/swapctl.h>
 
 #include <asm/pgtable.h>

===== mm/shmem.c 1.49 vs edited =====

mm/shmem.c +0 -1

@@ -25,7 +25,6 @@
 #include <linux/swap.h>
 #include <linux/pagemap.h>
 #include <linux/string.h>
-#include <linux/locks.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/shmem_fs.h>

===== net/khttpd/datasending.c 1.4 vs edited =====

net/khttpd/datasending.c +0 -1

@@ -36,7 +36,6 @@
 
 #include <linux/config.h>
 #include <linux/kernel.h>
-#include <linux/locks.h>
 #include <linux/skbuff.h>
 
 #include <net/tcp.h>

include/linux/locks.h deleted +0 ~~-28~~

@@ -1,28 +0,0 @@
-#ifndef _LINUX_LOCKS_H
-#define _LINUX_LOCKS_H
-
-#ifndef _LINUX_MM_H
-#include <linux/mm.h>
-#endif
-#ifndef _LINUX_PAGEMAP_H
-#include <linux/pagemap.h>
-#endif
-
-/*
- * super-block locking. Again, interrupts may only unlock
- * a super-block (although even this isn't done right now.
- * nfs may need it).
- */
-
-static inline void lock_super(struct super_block * sb)
-{
-	down(&sb->s_lock);
-}
-
-static inline void unlock_super(struct super_block * sb)
-{
-	up(&sb->s_lock);
-}
-
-#endif /* _LINUX_LOCKS_H */
-