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: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index f2deefdb406684c5f9b592deb580a3356100d946..90c1ccbff8e4df699ce2902379f7481e61a12d40 100644 (file)
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -646,8 +646,7 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end,
        sb = inode->i_sb;
        if (sb->s_dirt) {
                sb->s_dirt = 0;
-               if (!(sb->s_flags & MS_RDONLY))
-                       hfs_mdb_commit(sb);
+               hfs_mdb_commit(sb);
        }
        /* .. finally sync the buffers to disk */
        err = sync_blockdev(sb->s_bdev);

diff --git a/fs/hfs/mdb.c b/fs/hfs/mdb.c
index 7a3224049f30a6bc4eb0168eb42ed0ffb58c241e..5fd51a5833ffb91facba871b74589bf8b9a6c087 100644 (file)
--- a/fs/hfs/mdb.c
+++ b/fs/hfs/mdb.c
@@ -260,6 +260,9 @@ void hfs_mdb_commit(struct super_block *sb)
 {
        struct hfs_mdb *mdb = HFS_SB(sb)->mdb;
 
+       if (sb->s_flags & MS_RDONLY)
+               return;
+
        lock_buffer(HFS_SB(sb)->mdb_bh);
        if (test_and_clear_bit(HFS_FLG_MDB_DIRTY, &HFS_SB(sb)->flags)) {
                /* These parameters may have been modified, so write them back */

diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 47e4119a0650e4a11f16e0e3228c77734dc429ce..0730135b771e2d8d7c7df5e595a62a7705d020ab 100644 (file)
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -53,8 +53,7 @@ static void hfs_write_super(struct super_block *sb)
        sb->s_dirt = 0;
 
        /* sync everything to the buffers */
-       if (!(sb->s_flags & MS_RDONLY))
-               hfs_mdb_commit(sb);
+       hfs_mdb_commit(sb);
 }
 
 static int hfs_sync_fs(struct super_block *sb, int wait)