From: Artem Bityutskiy Subject: [PATCHv3 2/4] ext4: Convert last user of ext4_mark_super_dirty() to ext4_handle_dirty_super() Date: Tue, 3 Jul 2012 15:00:08 +0300 Message-ID: <1341316810-22598-3-git-send-email-dedekind1@gmail.com> References: <1341316810-22598-1-git-send-email-dedekind1@gmail.com> Cc: Jan Kara , Linux Kernel Maling List , Ext4 Mailing List , Linux FS Maling List To: Theodore Tso Return-path: In-Reply-To: <1341316810-22598-1-git-send-email-dedekind1@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org From: Jan Kara The last user of ext4_mark_super_dirty() in ext4_file_open() is so rare it can well be modifying the superblock properly by journalling the change. Change it and get rid of ext4_mark_super_dirty() as it's not needed anymore. Artem: small amendments. Artem: tested using xfstests for both journalled and non-journalled ext4. Signed-off-by: Jan Kara Tested-by: Artem Bityutskiy Signed-off-by: Artem Bityutskiy --- fs/ext4/ext4.h | 9 --------- fs/ext4/file.c | 14 +++++++++++++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index cfc4e01..0c4042e 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2321,15 +2321,6 @@ static inline void ext4_unlock_group(struct super_block *sb, spin_unlock(ext4_group_lock_ptr(sb, group)); } -static inline void ext4_mark_super_dirty(struct super_block *sb) -{ - struct ext4_super_block *es = EXT4_SB(sb)->s_es; - - ext4_superblock_csum_set(sb, es); - if (EXT4_SB(sb)->s_journal == NULL) - sb->s_dirt =1; -} - /* * Block validity checking */ diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 8c7642a..3a77494 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -181,9 +181,21 @@ static int ext4_file_open(struct inode * inode, struct file * filp) path.dentry = mnt->mnt_root; cp = d_path(&path, buf, sizeof(buf)); if (!IS_ERR(cp)) { + handle_t *handle; + int err; + + handle = ext4_journal_start_sb(sb, 1); + if (IS_ERR(handle)) + return PTR_ERR(handle); + err = ext4_journal_get_write_access(handle, sbi->s_sbh); + if (err) { + ext4_journal_stop(handle); + return err; + } strlcpy(sbi->s_es->s_last_mounted, cp, sizeof(sbi->s_es->s_last_mounted)); - ext4_mark_super_dirty(sb); + ext4_handle_dirty_super(handle, sb); + ext4_journal_stop(handle); } } /* -- 1.7.7.6