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

Commit 39f8d472 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Linus Torvalds
Browse files

hfs: convert extents_lock in a mutex 



Apple Macintosh file system: The semaphore extens_lock is used as a mutex.
Convert it to the mutex API

Signed-off-by: default avatarMatthias Kaehlcke <matthias@kaehlcke.net>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3084b72d

fs/hfs/btree.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke 
	{

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

	HFS_I(tree->inode)->flags = 0;

	init_MUTEX(&HFS_I(tree->inode)->extents_lock);

	mutex_init(&HFS_I(tree->inode)->extents_lock);

	switch (id) {

	case HFS_EXT_CNID:

		hfs_inode_read_fork(tree->inode, mdb->drXTExtRec, mdb->drXTFlSize,

fs/hfs/extent.c

+7 −7
Original line number Diff line number Diff line
@@ -343,16 +343,16 @@ int hfs_get_block(struct inode *inode, sector_t block, 
		goto done;

	}



	down(&HFS_I(inode)->extents_lock);

	mutex_lock(&HFS_I(inode)->extents_lock);

	res = hfs_ext_read_extent(inode, ablock);

	if (!res)

		dblock = hfs_ext_find_block(HFS_I(inode)->cached_extents,

					    ablock - HFS_I(inode)->cached_start);

	else {

		up(&HFS_I(inode)->extents_lock);

		mutex_unlock(&HFS_I(inode)->extents_lock);

		return -EIO;

	}

	up(&HFS_I(inode)->extents_lock);

	mutex_unlock(&HFS_I(inode)->extents_lock);



done:

	map_bh(bh_result, sb, HFS_SB(sb)->fs_start +
@@ -375,7 +375,7 @@ int hfs_extend_file(struct inode *inode) 
	u32 start, len, goal;

	int res;



	down(&HFS_I(inode)->extents_lock);

	mutex_lock(&HFS_I(inode)->extents_lock);

	if (HFS_I(inode)->alloc_blocks == HFS_I(inode)->first_blocks)

		goal = hfs_ext_lastblock(HFS_I(inode)->first_extents);

	else {
@@ -425,7 +425,7 @@ int hfs_extend_file(struct inode *inode) 
			goto insert_extent;

	}

out:

	up(&HFS_I(inode)->extents_lock);

	mutex_unlock(&HFS_I(inode)->extents_lock);

	if (!res) {

		HFS_I(inode)->alloc_blocks += len;

		mark_inode_dirty(inode);
@@ -487,7 +487,7 @@ void hfs_file_truncate(struct inode *inode) 
	if (blk_cnt == alloc_cnt)

		goto out;



	down(&HFS_I(inode)->extents_lock);

	mutex_lock(&HFS_I(inode)->extents_lock);

	hfs_find_init(HFS_SB(sb)->ext_tree, &fd);

	while (1) {

		if (alloc_cnt == HFS_I(inode)->first_blocks) {
@@ -514,7 +514,7 @@ void hfs_file_truncate(struct inode *inode) 
		hfs_brec_remove(&fd);

	}

	hfs_find_exit(&fd);

	up(&HFS_I(inode)->extents_lock);

	mutex_unlock(&HFS_I(inode)->extents_lock);



	HFS_I(inode)->alloc_blocks = blk_cnt;

out:

fs/hfs/hfs_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct hfs_inode_info { 
	struct list_head open_dir_list;

	struct inode *rsrc_inode;



	struct semaphore extents_lock;

	struct mutex extents_lock;



	u16 alloc_blocks, clump_blocks;

	sector_t fs_blocks;

fs/hfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ struct inode *hfs_new_inode(struct inode *dir, struct qstr *name, int mode) 
	if (!inode)

		return NULL;



	init_MUTEX(&HFS_I(inode)->extents_lock);

	mutex_init(&HFS_I(inode)->extents_lock);

	INIT_LIST_HEAD(&HFS_I(inode)->open_dir_list);

	hfs_cat_build_key(sb, (btree_key *)&HFS_I(inode)->cat_key, dir->i_ino, name);

	inode->i_ino = HFS_SB(sb)->next_id++;
@@ -281,7 +281,7 @@ static int hfs_read_inode(struct inode *inode, void *data) 


	HFS_I(inode)->flags = 0;

	HFS_I(inode)->rsrc_inode = NULL;

	init_MUTEX(&HFS_I(inode)->extents_lock);

	mutex_init(&HFS_I(inode)->extents_lock);

	INIT_LIST_HEAD(&HFS_I(inode)->open_dir_list);



	/* Initialize the inode */