From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759981AbYEHGcW (ORCPT ); Thu, 8 May 2008 02:32:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758264AbYEHGbd (ORCPT ); Thu, 8 May 2008 02:31:33 -0400 Received: from g4t0016.houston.hp.com ([15.201.24.19]:11483 "EHLO g4t0016.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756455AbYEHGbc (ORCPT ); Thu, 8 May 2008 02:31:32 -0400 From: Andrew Patterson Subject: [PATCH 4/5] Added flush_disk to factor out common buffer cache flushing code. To: linux-scsi@vger.kernel.org Cc: andrew.patterson@hp.com, linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk, axboe@kernel.dk, andmike@linux.vnet.ibm.com Date: Thu, 08 May 2008 00:31:31 -0600 Message-ID: <20080508063131.3818.96480.stgit@bluto.andrew> In-Reply-To: <20080508062930.3818.31401.stgit@bluto.andrew> References: <20080508062930.3818.31401.stgit@bluto.andrew> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Added flush_disk to factor out common buffer cache flushing code. We need to be able to flush the buffer cache for 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 --- 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 87014e6..eb2bc5c 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; +} + /** * revalidate_disk - wrapper for lower-level driver's revalidate_disk * call-back @@ -928,13 +955,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; }