From: Andrew Patterson <andrew.patterson@hp.com>
To: linux-scsi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk,
axboe@kernel.dk, andmike@linux.vnet.ibm.com,
Andrew Patterson <andrew.patterson@hp.com>
Subject: [PATCH 1/2] Added flush_disk to factor out common buffer cache flushing code.
Date: Mon, 05 May 2008 17:04:19 -0600 [thread overview]
Message-ID: <20080505230419.12905.36939.stgit@bluto.andrew> (raw)
In-Reply-To: <20080505230414.12905.15331.stgit@bluto.andrew>
Added flush_disk to factor out common buffer cache flushing code.
We need to be able to flush the buffer cache for more than just when a
disk is changed, so we factor out common cache flush code in
check_disk_change() to an internal flush_disk() routine. This routine
will then be used for both disk changes and disk resizes (in a later
patch).
Include the disk name in the text indicating that there are busy
inodes on the device and increase the KERN severity of the message.
Signed-off-by: Andrew Patterson <andrew.patterson@hp.com>
---
fs/block_dev.c | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 7d822fa..fcd0398 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -867,6 +867,33 @@ struct block_device *open_by_devnum(dev_t dev, unsigned mode)
EXPORT_SYMBOL(open_by_devnum);
+
+/**
+ * flush_disk - invalidates all buffer-cache entries on a disk
+ *
+ * @bdev: struct block device to be flushed
+ *
+ * Invalidates all buffer-cache entries on a disk. It should be called
+ * when a disk has been changed -- either by a media change or online
+ * resize.
+ */
+static void flush_disk(struct block_device *bdev)
+{
+ if (__invalidate_device(bdev)) {
+ char name[BDEVNAME_SIZE] = "";
+
+ if (bdev->bd_disk)
+ disk_name(bdev->bd_disk, 0, name);
+ printk(KERN_WARNING "VFS: busy inodes on changed media %s\n",
+ name);
+ }
+
+ if (!bdev->bd_disk)
+ return;
+ if (bdev->bd_disk->minors > 1)
+ bdev->bd_invalidated = 1;
+}
+
/*
* This routine checks whether a removable media has been changed,
* and invalidates all buffer-cache-entries in that case. This
@@ -886,13 +913,9 @@ int check_disk_change(struct block_device *bdev)
if (!bdops->media_changed(bdev->bd_disk))
return 0;
- if (__invalidate_device(bdev))
- printk("VFS: busy inodes on changed media.\n");
-
+ flush_disk(bdev);
if (bdops->revalidate_disk)
bdops->revalidate_disk(bdev->bd_disk);
- if (bdev->bd_disk->minors > 1)
- bdev->bd_invalidated = 1;
return 1;
}
next prev parent reply other threads:[~2008-05-05 23:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-05 23:04 [PATCH 0/4] detect online disk resize Andrew Patterson
2008-05-05 23:04 ` Andrew Patterson [this message]
2008-05-06 8:44 ` [PATCH 1/2] Added flush_disk to factor out common buffer cache flushing code Christoph Hellwig
2008-05-07 17:59 ` James Bottomley
2008-05-07 18:08 ` Andrew Patterson
2008-05-07 18:21 ` James Bottomley
2008-05-05 23:04 ` [PATCH 2/2] Wrapper for lower-level revalidate_disk routines Andrew Patterson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080505230419.12905.36939.stgit@bluto.andrew \
--to=andrew.patterson@hp.com \
--cc=andmike@linux.vnet.ibm.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox