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

Commit 715189d8 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by Al Viro
Browse files

hfs: push lock_super down 



HFS uses 'lock_super()'/'unlock_super()' around 'hfs_mdb_commit()' in order
to serialize MDB (Master Directory Block) changes. Push it down to
'hfs_mdb_commit()' in order to simplify the code a bit.

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9e6c5829

fs/hfs/inode.c

+0 −2
Original line number Diff line number Diff line
@@ -645,11 +645,9 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end, 
	/* sync the superblock to buffers */

	sb = inode->i_sb;

	if (sb->s_dirt) {

		lock_super(sb);

		sb->s_dirt = 0;

		if (!(sb->s_flags & MS_RDONLY))

			hfs_mdb_commit(sb);

		unlock_super(sb);

	}

	/* .. finally sync the buffers to disk */

	err = sync_blockdev(sb->s_bdev);

fs/hfs/mdb.c

+2 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ void hfs_mdb_commit(struct super_block *sb) 
{

	struct hfs_mdb *mdb = HFS_SB(sb)->mdb;



	lock_super(sb);

	if (test_and_clear_bit(HFS_FLG_MDB_DIRTY, &HFS_SB(sb)->flags)) {

		/* These parameters may have been modified, so write them back */

		mdb->drLsMod = hfs_mtime();
@@ -317,6 +318,7 @@ void hfs_mdb_commit(struct super_block *sb) 
			size -= len;

		}

	}

	unlock_super(sb);

}



void hfs_mdb_close(struct super_block *sb)

fs/hfs/super.c

+0 −4
Original line number Diff line number Diff line
@@ -50,21 +50,17 @@ MODULE_LICENSE("GPL"); 
 */

static void hfs_write_super(struct super_block *sb)

{

	lock_super(sb);

	sb->s_dirt = 0;



	/* sync everything to the buffers */

	if (!(sb->s_flags & MS_RDONLY))

		hfs_mdb_commit(sb);

	unlock_super(sb);

}



static int hfs_sync_fs(struct super_block *sb, int wait)

{

	lock_super(sb);

	hfs_mdb_commit(sb);

	sb->s_dirt = 0;

	unlock_super(sb);



	return 0;

}