Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4527440d authored Jul 12, 2012 by Artem Bityutskiy Committed by Al Viro Jul 22, 2012

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>

parent a3742d48

fs/hfs/inode.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -646,7 +646,6 @@ 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);
		}
		/* .. finally sync the buffers to disk */

fs/hfs/mdb.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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 */

fs/hfs/super.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ 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);
		}