Darkangeel_hd
/
lineage_android_kernel_xiaomi_sdm845
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_xiaomi_sdm845.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Artem Bityutskiy 2012-07-12 17:28:44 +03:00 committed by Al Viro
parent 9e6c5829b0
commit 715189d836
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/hfs/inode.c
View File

@ -645,11 +645,9 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end,
/* sync the superblock to buffers */ /* sync the superblock to buffers */
sb = inode->i_sb; sb = inode->i_sb;
if (sb->s_dirt) { if (sb->s_dirt) {
lock_super(sb);
sb->s_dirt = 0; sb->s_dirt = 0;
if (!(sb->s_flags & MS_RDONLY)) if (!(sb->s_flags & MS_RDONLY))
hfs_mdb_commit(sb); hfs_mdb_commit(sb);
unlock_super(sb);
} }
/* .. finally sync the buffers to disk */ /* .. finally sync the buffers to disk */
err = sync_blockdev(sb->s_bdev); err = sync_blockdev(sb->s_bdev);

2
fs/hfs/mdb.c
View File

@ -260,6 +260,7 @@ void hfs_mdb_commit(struct super_block *sb)
{ {
struct hfs_mdb *mdb = HFS_SB(sb)->mdb; struct hfs_mdb *mdb = HFS_SB(sb)->mdb;
lock_super(sb);
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 */
mdb->drLsMod = hfs_mtime(); mdb->drLsMod = hfs_mtime();
@ -317,6 +318,7 @@ void hfs_mdb_commit(struct super_block *sb)
size -= len; size -= len;
} }
} }
unlock_super(sb);
} }
void hfs_mdb_close(struct super_block *sb) void hfs_mdb_close(struct super_block *sb)

4
fs/hfs/super.c
View File

@ -50,21 +50,17 @@ MODULE_LICENSE("GPL");
*/ */
static void hfs_write_super(struct super_block *sb) static void hfs_write_super(struct super_block *sb)
{ {
lock_super(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)) if (!(sb->s_flags & MS_RDONLY))
hfs_mdb_commit(sb); hfs_mdb_commit(sb);
unlock_super(sb);
} }
static int hfs_sync_fs(struct super_block *sb, int wait) static int hfs_sync_fs(struct super_block *sb, int wait)
{ {
lock_super(sb);
hfs_mdb_commit(sb); hfs_mdb_commit(sb);
sb->s_dirt = 0; sb->s_dirt = 0;
unlock_super(sb);
return 0; return 0;
} }