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

Commit 3072b90c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

hfs: use sync_dirty_buffer 



Use sync_dirty_buffer instead of the incorrect opencoding it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4a3956c7

fs/hfs/hfs_fs.h

+0 −11
Original line number Diff line number Diff line
@@ -254,17 +254,6 @@ static inline void hfs_bitmap_dirty(struct super_block *sb) 
	sb->s_dirt = 1;

}



static inline void hfs_buffer_sync(struct buffer_head *bh)

{

	while (buffer_locked(bh)) {

		wait_on_buffer(bh);

	}

	if (buffer_dirty(bh)) {

		ll_rw_block(WRITE, 1, &bh);

		wait_on_buffer(bh);

	}

}



#define sb_bread512(sb, sec, data) ({			\

	struct buffer_head *__bh;			\

	sector_t __block;				\

fs/hfs/mdb.c

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ int hfs_mdb_get(struct super_block *sb) 
		mdb->drLsMod = hfs_mtime();



		mark_buffer_dirty(HFS_SB(sb)->mdb_bh);

		hfs_buffer_sync(HFS_SB(sb)->mdb_bh);

		sync_dirty_buffer(HFS_SB(sb)->mdb_bh);

	}



	return 0;
@@ -287,7 +287,7 @@ void hfs_mdb_commit(struct super_block *sb) 
		HFS_SB(sb)->alt_mdb->drAtrb |= cpu_to_be16(HFS_SB_ATTRIB_UNMNT);

		HFS_SB(sb)->alt_mdb->drAtrb &= cpu_to_be16(~HFS_SB_ATTRIB_INCNSTNT);

		mark_buffer_dirty(HFS_SB(sb)->alt_mdb_bh);

		hfs_buffer_sync(HFS_SB(sb)->alt_mdb_bh);

		sync_dirty_buffer(HFS_SB(sb)->alt_mdb_bh);

	}



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