[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20101203001659.GI18195@tux1.beaverton.ibm.com>
Date: Thu, 2 Dec 2010 16:16:59 -0800
From: "Darrick J. Wong" <djwong@...ibm.com>
To: "Theodore Ts'o" <tytso@....edu>
Cc: linux-kernel <linux-kernel@...r.kernel.org>,
linux-ext4 <linux-ext4@...r.kernel.org>
Subject: [PATCH] ext4: 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/ext4/super.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index e32195d..098dcf0 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3124,6 +3124,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
&journal_ioprio, 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)) {
+ ext4_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);
@@ -4198,6 +4205,13 @@ static int ext4_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)) {
+ ext4_msg(sb, KERN_WARNING, "flush not supported; disabling.");
+ clear_opt(sbi->s_mount_opt, BARRIER);
+ }
+
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "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