diff options
author | Jan Kara <jack@suse.cz> | 2012-07-22 20:31:31 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2012-07-22 20:31:31 -0400 |
commit | 044ce47fec90ec0f25605e87a5d72cca14568bc3 (patch) | |
tree | 439a34c551e0ac4fd653d8e7870782ee19cb85a5 /fs/ext4/file.c | |
parent | 97a7406880f61d7f89d613cf72e87682420e66b0 (diff) |
ext4: convert last user of ext4_mark_super_dirty() to ext4_handle_dirty_super()
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 <jack@suse.cz>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Tested-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'fs/ext4/file.c')
-rw-r--r-- | fs/ext4/file.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 1c81509f5bd9..f77e795fed65 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c | |||
@@ -244,9 +244,21 @@ static int ext4_file_open(struct inode * inode, struct file * filp) | |||
244 | path.dentry = mnt->mnt_root; | 244 | path.dentry = mnt->mnt_root; |
245 | cp = d_path(&path, buf, sizeof(buf)); | 245 | cp = d_path(&path, buf, sizeof(buf)); |
246 | if (!IS_ERR(cp)) { | 246 | if (!IS_ERR(cp)) { |
247 | handle_t *handle; | ||
248 | int err; | ||
249 | |||
250 | handle = ext4_journal_start_sb(sb, 1); | ||
251 | if (IS_ERR(handle)) | ||
252 | return PTR_ERR(handle); | ||
253 | err = ext4_journal_get_write_access(handle, sbi->s_sbh); | ||
254 | if (err) { | ||
255 | ext4_journal_stop(handle); | ||
256 | return err; | ||
257 | } | ||
247 | strlcpy(sbi->s_es->s_last_mounted, cp, | 258 | strlcpy(sbi->s_es->s_last_mounted, cp, |
248 | sizeof(sbi->s_es->s_last_mounted)); | 259 | sizeof(sbi->s_es->s_last_mounted)); |
249 | ext4_mark_super_dirty(sb); | 260 | ext4_handle_dirty_super(handle, sb); |
261 | ext4_journal_stop(handle); | ||
250 | } | 262 | } |
251 | } | 263 | } |
252 | /* | 264 | /* |