This is a note to let you know that I've just added the patch titled
ext4: allow the mount options nodelalloc and data=journal
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ext4-allow-the-mount-options-nodelalloc-and-data-journal.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 59d9fa5c2e9086db11aa287bb4030151d0095a17 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <[email protected]>
Date: Thu, 8 Aug 2013 23:01:24 -0400
Subject: ext4: allow the mount options nodelalloc and data=journal
From: Theodore Ts'o <[email protected]>
commit 59d9fa5c2e9086db11aa287bb4030151d0095a17 upstream.
Commit 26092bf ("ext4: use a table-driven handler for mount options")
wrongly disallows the specifying the mount options nodelalloc and
data=journal simultaneously. This is incorrect; it should have only
disallowed the combination of delalloc and data=journal
simultaneously.
Reported-by: Piotr Sarna <[email protected]>
Signed-off-by: "Theodore Ts'o" <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
fs/ext4/super.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1341,7 +1341,7 @@ static const struct mount_opts {
{Opt_delalloc, EXT4_MOUNT_DELALLOC,
MOPT_EXT4_ONLY | MOPT_SET | MOPT_EXPLICIT},
{Opt_nodelalloc, EXT4_MOUNT_DELALLOC,
- MOPT_EXT4_ONLY | MOPT_CLEAR | MOPT_EXPLICIT},
+ MOPT_EXT4_ONLY | MOPT_CLEAR},
{Opt_journal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,
MOPT_EXT4_ONLY | MOPT_SET},
{Opt_journal_async_commit, (EXT4_MOUNT_JOURNAL_ASYNC_COMMIT |
Patches currently in stable-queue which might be from [email protected] are
queue-3.10/ext4-flush-the-extent-status-cache-during-ext4_ioc_swap_boot.patch
queue-3.10/ext4-fix-retry-handling-in-ext4_ext_truncate.patch
queue-3.10/ext4-allow-the-mount-options-nodelalloc-and-data-journal.patch
queue-3.10/ext4-fix-mount-remount-error-messages-for-incompatible-mount-options.patch
queue-3.10/ext4-make-sure-group-number-is-bumped-after-a-inode-allocation-race.patch
queue-3.10/ext4-destroy-ext4_es_cachep-on-module-unload.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
