Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx1.redhat.com ([209.132.183.28]:34740 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932355Ab2EOOdu (ORCPT ); Tue, 15 May 2012 10:33:50 -0400 From: Josef Bacik To: linux-ext4@vger.kernel.org, linux-nfs@vger.kernel.org, bfields@fieldses.org, adilger@dilger.ca, tytso@mit.edu, jack@suse.cz Subject: [PATCH] ext4: fix how i_version is modified and turn it on by default V2 Date: Tue, 15 May 2012 10:33:16 -0400 Message-Id: <1337092396-3272-1-git-send-email-josef@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: This makes MS_I_VERSION be turned on by default. Ext4 had been unconditionally doing i_version++ in a few cases anway so the mount option was kind of silly. This patch also removes the update in mark_inode_dirty and makes all of the cases where we update ctime also do inode_inc_iversion. file_update_time takes care of the write case and all the places where we update iversion are protected by the i_mutex so there should be no extra i_lock overhead in the normal non-exported fs case. Thanks, Signed-off-by: Josef Bacik --- V1->V2: introduce ext4_inode_update_time helper to update ctime/time and i_version to make the code a little easier and make it less fragile. fs/ext4/acl.c | 2 +- fs/ext4/ext4.h | 16 ++++++++++++++++ fs/ext4/extents.c | 13 ++++--------- fs/ext4/indirect.c | 2 +- fs/ext4/inode.c | 3 --- fs/ext4/ioctl.c | 4 ++-- fs/ext4/namei.c | 24 ++++++++++-------------- fs/ext4/super.c | 6 +++--- fs/ext4/xattr.c | 2 +- 9 files changed, 38 insertions(+), 34 deletions(-) diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c index a5c29bb..c445d3a 100644 --- a/fs/ext4/acl.c +++ b/fs/ext4/acl.c @@ -202,7 +202,7 @@ ext4_set_acl(handle_t *handle, struct inode *inode, int type, if (error < 0) return error; else { - inode->i_ctime = ext4_current_time(inode); + ext4_inode_update_time(inode, CTIME); ext4_mark_inode_dirty(handle, inode); if (error == 0) acl = NULL; diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 513004f..9ff4bdb 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1276,6 +1276,22 @@ static inline struct timespec ext4_current_time(struct inode *inode) current_fs_time(inode->i_sb) : CURRENT_TIME_SEC; } +enum time_update { + MTIME = 1, + CTIME = 2, +}; + +static inline void ext4_inode_update_time(struct inode *inode, int flags) +{ + inode_inc_iversion(inode); + + if (flags & MTIME) + inode->i_mtime = ext4_current_time(inode); + if (flags & CTIME) + inode->i_ctime = ext4_current_time(inode); +} + + static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino) { return ino == EXT4_ROOT_INO || diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 74f23c2..5c2b4cf 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4249,7 +4249,7 @@ out_stop: if (inode->i_nlink) ext4_orphan_del(handle, inode); - inode->i_mtime = inode->i_ctime = ext4_current_time(inode); + ext4_inode_update_time(inode, CTIME | MTIME); ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } @@ -4257,13 +4257,8 @@ out_stop: static void ext4_falloc_update_inode(struct inode *inode, int mode, loff_t new_size, int update_ctime) { - struct timespec now; - - if (update_ctime) { - now = current_fs_time(inode->i_sb); - if (!timespec_equal(&inode->i_ctime, &now)) - inode->i_ctime = now; - } + if (update_ctime) + ext4_inode_update_time(inode, CTIME); /* * Update only when preallocation was requested beyond * the file size. @@ -4905,7 +4900,7 @@ int ext4_ext_punch_hole(struct file *file, loff_t offset, loff_t length) out: ext4_orphan_del(handle, inode); - inode->i_mtime = inode->i_ctime = ext4_current_time(inode); + ext4_inode_update_time(inode, CTIME | MTIME); ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); return err; diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c index 830e1b2..a63a4ad 100644 --- a/fs/ext4/indirect.c +++ b/fs/ext4/indirect.c @@ -1476,7 +1476,7 @@ do_indirects: out_unlock: up_write(&ei->i_data_sem); - inode->i_mtime = inode->i_ctime = ext4_current_time(inode); + ext4_inode_update_time(inode, CTIME | MTIME); ext4_mark_inode_dirty(handle, inode); /* diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index feaa82f..d11b4e5 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4314,9 +4314,6 @@ int ext4_mark_iloc_dirty(handle_t *handle, { int err = 0; - if (test_opt(inode->i_sb, I_VERSION)) - inode_inc_iversion(inode); - /* the do_update_inode consumes one bh->b_count */ get_bh(iloc->bh); diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 6eee255..a162faf 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -120,7 +120,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ei->i_flags = flags; ext4_set_inode_flags(inode); - inode->i_ctime = ext4_current_time(inode); + ext4_inode_update_time(inode, CTIME); err = ext4_mark_iloc_dirty(handle, inode, &iloc); flags_err: @@ -168,7 +168,7 @@ flags_out: } err = ext4_reserve_inode_write(handle, inode, &iloc); if (err == 0) { - inode->i_ctime = ext4_current_time(inode); + ext4_inode_update_time(inode, CTIME); inode->i_generation = generation; err = ext4_mark_iloc_dirty(handle, inode, &iloc); } diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 2043f48..c8417e6 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1316,9 +1316,8 @@ static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry, * happen is that the times are slightly out of date * and/or different from the directory change time. */ - dir->i_mtime = dir->i_ctime = ext4_current_time(dir); + ext4_inode_update_time(dir, CTIME | MTIME); ext4_update_dx_flag(dir); - dir->i_version++; ext4_mark_inode_dirty(handle, dir); BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata"); err = ext4_handle_dirty_metadata(handle, dir, bh); @@ -1668,7 +1667,6 @@ static int ext4_delete_entry(handle_t *handle, blocksize); else de->inode = 0; - dir->i_version++; BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata"); err = ext4_handle_dirty_metadata(handle, dir, bh); if (unlikely(err)) { @@ -2158,14 +2156,14 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry) ext4_warning(inode->i_sb, "empty directory has too many links (%d)", inode->i_nlink); - inode->i_version++; clear_nlink(inode); /* There's no need to set i_disksize: the fact that i_nlink is * zero will ensure that the right thing happens during any * recovery. */ inode->i_size = 0; ext4_orphan_add(handle, inode); - inode->i_ctime = dir->i_ctime = dir->i_mtime = ext4_current_time(inode); + ext4_inode_update_time(inode, CTIME); + ext4_inode_update_time(dir, CTIME | MTIME); ext4_mark_inode_dirty(handle, inode); ext4_dec_count(handle, dir); ext4_update_dx_flag(dir); @@ -2218,13 +2216,13 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry) retval = ext4_delete_entry(handle, dir, de, bh); if (retval) goto end_unlink; - dir->i_ctime = dir->i_mtime = ext4_current_time(dir); + ext4_inode_update_time(dir, MTIME | CTIME); ext4_update_dx_flag(dir); ext4_mark_inode_dirty(handle, dir); drop_nlink(inode); if (!inode->i_nlink) ext4_orphan_add(handle, inode); - inode->i_ctime = ext4_current_time(inode); + ext4_inode_update_time(inode, CTIME); ext4_mark_inode_dirty(handle, inode); retval = 0; @@ -2363,7 +2361,7 @@ retry: if (IS_DIRSYNC(dir)) ext4_handle_sync(handle); - inode->i_ctime = ext4_current_time(inode); + ext4_inode_update_time(inode, CTIME); ext4_inc_count(handle, inode); ihold(inode); @@ -2470,9 +2468,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, if (EXT4_HAS_INCOMPAT_FEATURE(new_dir->i_sb, EXT4_FEATURE_INCOMPAT_FILETYPE)) new_de->file_type = old_de->file_type; - new_dir->i_version++; - new_dir->i_ctime = new_dir->i_mtime = - ext4_current_time(new_dir); + ext4_inode_update_time(new_dir, CTIME | MTIME); ext4_mark_inode_dirty(handle, new_dir); BUFFER_TRACE(new_bh, "call ext4_handle_dirty_metadata"); retval = ext4_handle_dirty_metadata(handle, new_dir, new_bh); @@ -2488,7 +2484,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, * Like most other Unix systems, set the ctime for inodes on a * rename. */ - old_inode->i_ctime = ext4_current_time(old_inode); + ext4_inode_update_time(old_inode, CTIME); ext4_mark_inode_dirty(handle, old_inode); /* @@ -2521,9 +2517,9 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, if (new_inode) { ext4_dec_count(handle, new_inode); - new_inode->i_ctime = ext4_current_time(new_inode); + ext4_inode_update_time(new_inode, CTIME); } - old_dir->i_ctime = old_dir->i_mtime = ext4_current_time(old_dir); + ext4_inode_update_time(old_dir, CTIME | MTIME); ext4_update_dx_flag(old_dir); if (dir_bh) { PARENT_INO(dir_bh->b_data, new_dir->i_sb->s_blocksize) = diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 502c61f..98d6863 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1813,8 +1813,7 @@ set_qf_format: "Ignoring deprecated bh option"); break; case Opt_i_version: - set_opt(sb, I_VERSION); - sb->s_flags |= MS_I_VERSION; + /* On by default now */ break; case Opt_nodelalloc: clear_opt(sb, DELALLOC); @@ -3132,6 +3131,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) goto out_free_orig; } sb->s_fs_info = sbi; + sb->s_flags |= MS_I_VERSION; sbi->s_mount_opt = 0; sbi->s_resuid = EXT4_DEF_RESUID; sbi->s_resgid = EXT4_DEF_RESGID; @@ -4831,7 +4831,7 @@ static int ext4_quota_off(struct super_block *sb, int type) handle = ext4_journal_start(inode, 1); if (IS_ERR(handle)) goto out; - inode->i_mtime = inode->i_ctime = CURRENT_TIME; + ext4_inode_update_time(inode, CTIME | MTIME); ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 93a00d8..e8bcc6f 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -1048,7 +1048,7 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, } if (!error) { ext4_xattr_update_super_block(handle, inode->i_sb); - inode->i_ctime = ext4_current_time(inode); + ext4_inode_update_time(inode, CTIME); if (!value) ext4_clear_inode_state(inode, EXT4_STATE_NO_EXPAND); error = ext4_mark_iloc_dirty(handle, inode, &is.iloc); -- 1.7.7.6