From c018e6fe27f0cd4abb45ef308ede21674e1fbae8 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Wed, 22 May 2002 22:52:24 -0700
Subject: [PATCH] [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.
---
 drivers/block/blkpg.c     | 1 +
 drivers/block/floppy.c    | 2 ++
 drivers/block/ll_rw_blk.c | 1 +
 drivers/block/loop.c      | 1 +
 drivers/block/rd.c        | 1 +
 drivers/char/sysrq.c      | 1 +
 drivers/ide/ide-disk.c    | 2 ++
 drivers/scsi/scsicam.c    | 1 +
 drivers/scsi/sr_ioctl.c   | 1 +
 9 files changed, 11 insertions(+)

diff --git a/drivers/block/blkpg.c b/drivers/block/blkpg.c
index 595fa49af3ef..e11f7d3283d2 100644
--- 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 14864e69cc3a..63f38685e5cb 100644
--- 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 f904d7ad813d..87c53a81ef22 100644
--- 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 1016fe70d1e5..a91477f0b2be 100644
--- 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 e097052c5376..4010eaa73706 100644
--- 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 631563965c44..3ae793e1209c 100644
--- 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 6fdcb7a36365..8c773b64d4fe 100644
--- 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 919ca8d6d39d..7559b235eba3 100644
--- 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 3ca289555fc8..ebf2474d7067 100644
--- 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>
-- 
2.39.5