[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20101203012611.GJ18195@tux1.beaverton.ibm.com>
Date: Thu, 2 Dec 2010 17:26:11 -0800
From: "Darrick J. Wong" <djwong@...ibm.com>
To: Jan Kara <jack@...e.cz>, Andreas Dilger <adilger.kernel@...ger.ca>,
Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-kernel <linux-kernel@...r.kernel.org>,
linux-ext4 <linux-ext4@...r.kernel.org>
Subject: [PATCH] ext3: Set barrier=0 when block device does not advertise
flush support
If the user tries to enable write flushes with "barrier=1" and the underlying
block device does not support flushes, print a message and set barrier=0.
Signed-off-by: Darrick J. Wong <djwong@...ibm.com>
---
fs/ext3/super.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index d15209e..75ca265 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1691,6 +1691,13 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
NULL, 0))
goto failed_mount;
+ /* Catch barrier=1 and no flush support */
+ if (test_opt(sb, BARRIER) &&
+ !(sb->s_bdev->bd_disk->queue->flush_flags & REQ_FLUSH)) {
+ ext3_msg(sb, KERN_WARNING, "flush not supported; disabling.");
+ clear_opt(sbi->s_mount_opt, BARRIER);
+ }
+
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
@@ -2574,6 +2581,13 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
goto restore_opts;
}
+ /* Catch barrier=1 and no flush support */
+ if (test_opt(sb, BARRIER) &&
+ !(sb->s_bdev->bd_disk->queue->flush_flags & REQ_FLUSH)) {
+ ext3_msg(sb, KERN_WARNING, "flush not supported; disabling.");
+ clear_opt(sbi->s_mount_opt, BARRIER);
+ }
+
if (test_opt(sb, ABORT))
ext3_abort(sb, __func__, "Abort forced by user");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists