[PATCH] include buffer_head.h in actual users instead of fs.h (5/10)

Include buffer_head.h directly in the file in drivers/ that need it
(9 files).  Note that most of this uses are layering violations that I
will address later.

diff --git a/drivers/block/blkpg.c b/drivers/block/blkpg.c
index 595fa49af3ef7a362fdb44e25e129600d9fbc91e..e11f7d3283d29f1db4501f2fb2c2e104fef225c6 100644 (file)
--- a/drivers/block/blkpg.c
+++ b/drivers/block/blkpg.c
@@ -36,6 +36,7 @@
 #include <linux/genhd.h>
 #include <linux/module.h>               /* for EXPORT_SYMBOL */
 #include <linux/backing-dev.h>
+#include <linux/buffer_head.h>
 
 #include <asm/uaccess.h>
 

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 14864e69cc3a0fb187003ef0e92d98575ec8d39e..63f38685e5cb6020a35e6c54e78abe8cb18e25b3 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -174,6 +174,7 @@ static int print_unex=1;
 #include <linux/init.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/device.h>
+#include <linux/buffer_head.h>         /* for invalidate_buffers() */
 
 /*
  * PS/2 floppies have much slower step rates than regular floppies.
@@ -3793,6 +3794,7 @@ static int floppy_open(struct inode * inode, struct file * filp)
        if (old_dev != -1 && old_dev != minor(inode->i_rdev)) {
                if (buffer_drive == drive)
                        buffer_track = -1;
+               /* umm, invalidate_buffers() in ->open??  --hch */
                invalidate_buffers(mk_kdev(FLOPPY_MAJOR,old_dev));
        }
 

diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index f904d7ad813d930339f989754bbed6a723443764..87c53a81ef225ec69319803b0f295983686efe02 100644 (file)
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -25,6 +25,7 @@
 #include <linux/bootmem.h>
 #include <linux/completion.h>
 #include <linux/compiler.h>
+#include <linux/buffer_head.h>
 #include <scsi/scsi.h>
 #include <linux/backing-dev.h>
 

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 1016fe70d1e58110f95308fa1dad2910f8afc821..a91477f0b2befef533976e89e6637d9db1870a83 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -73,6 +73,7 @@
 #include <linux/slab.h>
 #include <linux/loop.h>
 #include <linux/suspend.h>
+#include <linux/buffer_head.h>         /* for invalidate_bdev() */
 
 #include <asm/uaccess.h>
 

diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index e097052c53762c437328c721bced0300719fd0a5..4010eaa73706ee1670f168a3fe1f71b2b7046c58 100644 (file)
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -48,6 +48,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/buffer_head.h>         /* for invalidate_bdev() */
 #include <asm/uaccess.h>
 
 /*

diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 631563965c447ffc1461f3c255bf59f6f9b10d1e..3ae793e1209cda9cf7883648b83ef8094893b7b7 100644 (file)
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -28,6 +28,7 @@
 #include <linux/smp_lock.h>
 #include <linux/module.h>
 #include <linux/suspend.h>
+#include <linux/buffer_head.h>         /* for fsync_bdev()/wakeup_bdflush() */
 
 #include <linux/spinlock.h>
 

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 6fdcb7a363653e0def8ceecde6ef7f3228fed2c5..8c773b64d4fe94132d73eaed00a360b95b25398f 100644 (file)
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/suspend.h>
+#include <linux/buffer_head.h>         /* for invalidate_bdev() */
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
@@ -392,6 +393,7 @@ static void idedisk_release(struct inode *inode, struct file *filp, struct ata_d
        if (drive->removable && !drive->usage) {
                struct ata_taskfile args;
 
+               /* XXX I don't think this is up to the lowlevel drivers..  --hch */
                invalidate_bdev(inode->i_bdev, 0);
 
                memset(&args, 0, sizeof(args));

diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c
index 919ca8d6d39d1ee1314b21190d43ff56f9666b51..7559b235eba369775e654c7e3c2dc8fed9bd5d19 100644 (file)
--- a/drivers/scsi/scsicam.c
+++ b/drivers/scsi/scsicam.c
@@ -16,6 +16,7 @@
 #include <linux/genhd.h>
 #include <linux/kernel.h>
 #include <linux/blk.h>
+#include <linux/buffer_head.h>
 #include <asm/unaligned.h>
 #include "scsi.h"
 #include "hosts.h"

diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 3ca289555fc808199b024569ffc83a838c06531e..ebf2474d7067a79474bbe72fad9e5c27fec94dec 100644 (file)
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -5,6 +5,7 @@
 #include <asm/uaccess.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/buffer_head.h>         /* for invalidate_buffers() */
 
 #include <linux/blk.h>
 #include <linux/blkpg.h>