Commit 4527440d authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by Al Viro

hfs: simplify a bit checking for R/O

We have the following pattern in 2 places in HFS

if (!RDONLY)
	hfs_mdb_commit();

This patch pushes the RDONLY check down to 'hfs_mdb_commit()'. This will
make the following patches a bit simpler.
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a3742d48
...@@ -646,7 +646,6 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end, ...@@ -646,7 +646,6 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end,
sb = inode->i_sb; sb = inode->i_sb;
if (sb->s_dirt) { if (sb->s_dirt) {
sb->s_dirt = 0; sb->s_dirt = 0;
if (!(sb->s_flags & MS_RDONLY))
hfs_mdb_commit(sb); hfs_mdb_commit(sb);
} }
/* .. finally sync the buffers to disk */ /* .. finally sync the buffers to disk */
......
...@@ -260,6 +260,9 @@ void hfs_mdb_commit(struct super_block *sb) ...@@ -260,6 +260,9 @@ void hfs_mdb_commit(struct super_block *sb)
{ {
struct hfs_mdb *mdb = HFS_SB(sb)->mdb; struct hfs_mdb *mdb = HFS_SB(sb)->mdb;
if (sb->s_flags & MS_RDONLY)
return;
lock_buffer(HFS_SB(sb)->mdb_bh); lock_buffer(HFS_SB(sb)->mdb_bh);
if (test_and_clear_bit(HFS_FLG_MDB_DIRTY, &HFS_SB(sb)->flags)) { if (test_and_clear_bit(HFS_FLG_MDB_DIRTY, &HFS_SB(sb)->flags)) {
/* These parameters may have been modified, so write them back */ /* These parameters may have been modified, so write them back */
......
...@@ -53,7 +53,6 @@ static void hfs_write_super(struct super_block *sb) ...@@ -53,7 +53,6 @@ static void hfs_write_super(struct super_block *sb)
sb->s_dirt = 0; sb->s_dirt = 0;
/* sync everything to the buffers */ /* sync everything to the buffers */
if (!(sb->s_flags & MS_RDONLY))
hfs_mdb_commit(sb); hfs_mdb_commit(sb);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment