From: Theodore Ts'o <tytso@mit.edu>
To: Ext4 Developers List <linux-ext4@vger.kernel.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 03/11] ext4: remove the I_VERSION mount flag and use the super_block flag instead
Date: Sun, 4 Mar 2012 22:08:17 -0500 [thread overview]
Message-ID: <1330916905-5976-3-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1330916905-5976-1-git-send-email-tytso@mit.edu>
There's no point to have two bits that are set in parallel; so use the
MS_I_VERSION flag that is needed by the VFS anyway, and that way we
free up a bit in sbi->s_mount_opts.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
fs/ext4/ext4.h | 1 -
fs/ext4/inode.c | 2 +-
fs/ext4/super.c | 3 +--
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 4076746..df93dc1 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -942,7 +942,6 @@ struct ext4_inode_info {
#define EXT4_MOUNT_DIOREAD_NOLOCK 0x400000 /* Enable support for dio read nolocking */
#define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */
#define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */
-#define EXT4_MOUNT_I_VERSION 0x2000000 /* i_version support */
#define EXT4_MOUNT_MBLK_IO_SUBMIT 0x4000000 /* multi-block io submits */
#define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */
#define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index aafc626..38dc5f3 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4322,7 +4322,7 @@ int ext4_mark_iloc_dirty(handle_t *handle,
{
int err = 0;
- if (test_opt(inode->i_sb, I_VERSION))
+ if (IS_I_VERSION(inode))
inode_inc_iversion(inode);
/* the do_update_inode consumes one bh->b_count */
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 7dbad76..6b27bc6 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1125,7 +1125,7 @@ static int ext4_show_options(struct seq_file *seq, struct dentry *root)
seq_puts(seq, ",journal_async_commit");
else if (test_opt(sb, JOURNAL_CHECKSUM))
seq_puts(seq, ",journal_checksum");
- if (test_opt(sb, I_VERSION))
+ if (sb->s_flags & MS_I_VERSION)
seq_puts(seq, ",i_version");
if (!test_opt(sb, DELALLOC) &&
!(def_mount_opts & EXT4_DEFM_NODELALLOC))
@@ -1793,7 +1793,6 @@ set_qf_format:
"Ignoring deprecated bh option");
break;
case Opt_i_version:
- set_opt(sb, I_VERSION);
sb->s_flags |= MS_I_VERSION;
break;
case Opt_nodelalloc:
--
1.7.9.107.g97f9a
next prev parent reply other threads:[~2012-03-05 3:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 3:08 [PATCH 01/11] ext4: remove deprecation warnings for minix_df and grpid Theodore Ts'o
2012-03-05 3:08 ` [PATCH 02/11] ext4: remove Opt_ignore Theodore Ts'o
2012-03-05 3:08 ` Theodore Ts'o [this message]
2012-03-05 3:08 ` [PATCH 04/11] ext4: simplify handling of the errors=* mount options Theodore Ts'o
2012-03-05 3:08 ` [PATCH 05/11] ext4: unify handling of mount options which have been removed Theodore Ts'o
2012-03-05 3:08 ` [PATCH 06/11] ext4: use a table-driven handler for mount options Theodore Ts'o
2012-03-05 3:08 ` [PATCH 07/11] ext4: move ext4_show_options() after parse_options() Theodore Ts'o
2012-03-05 3:08 ` [PATCH 08/11] ext4: make ext4_show_options() be table-driven Theodore Ts'o
2012-03-05 3:08 ` [PATCH 09/11] ext4: add debugging /proc file showing file system options Theodore Ts'o
2012-03-05 3:08 ` [PATCH 10/11] ext4: ignore mount options supported by ext2/3 (but have since been removed) Theodore Ts'o
2012-03-05 3:08 ` [PATCH 11/11] ext4: try to deprecate noacl and noxattr_user mount options Theodore Ts'o
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=1330916905-5976-3-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=linux-ext4@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).