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

Commit 895c23f8 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Linus Torvalds
Browse files

hfsplus: convert the extents_lock in a mutex 



Apple Extended HFS file system: The semaphore extents 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 39f8d472

fs/hfsplus/extents.c

+7 −7
Original line number Diff line number Diff line
@@ -199,16 +199,16 @@ int hfsplus_get_block(struct inode *inode, sector_t iblock, 
		goto done;

	}



	down(&HFSPLUS_I(inode).extents_lock);

	mutex_lock(&HFSPLUS_I(inode).extents_lock);

	res = hfsplus_ext_read_extent(inode, ablock);

	if (!res) {

		dblock = hfsplus_ext_find_block(HFSPLUS_I(inode).cached_extents, ablock -

					     HFSPLUS_I(inode).cached_start);

	} else {

		up(&HFSPLUS_I(inode).extents_lock);

		mutex_unlock(&HFSPLUS_I(inode).extents_lock);

		return -EIO;

	}

	up(&HFSPLUS_I(inode).extents_lock);

	mutex_unlock(&HFSPLUS_I(inode).extents_lock);



done:

	dprint(DBG_EXTENT, "get_block(%lu): %llu - %u\n", inode->i_ino, (long long)iblock, dblock);
@@ -355,7 +355,7 @@ int hfsplus_file_extend(struct inode *inode) 
		return -ENOSPC;

	}



	down(&HFSPLUS_I(inode).extents_lock);

	mutex_lock(&HFSPLUS_I(inode).extents_lock);

	if (HFSPLUS_I(inode).alloc_blocks == HFSPLUS_I(inode).first_blocks)

		goal = hfsplus_ext_lastblock(HFSPLUS_I(inode).first_extents);

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

	}

out:

	up(&HFSPLUS_I(inode).extents_lock);

	mutex_unlock(&HFSPLUS_I(inode).extents_lock);

	if (!res) {

		HFSPLUS_I(inode).alloc_blocks += len;

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

		goto out;



	down(&HFSPLUS_I(inode).extents_lock);

	mutex_lock(&HFSPLUS_I(inode).extents_lock);

	hfs_find_init(HFSPLUS_SB(sb).ext_tree, &fd);

	while (1) {

		if (alloc_cnt == HFSPLUS_I(inode).first_blocks) {
@@ -492,7 +492,7 @@ void hfsplus_file_truncate(struct inode *inode) 
		hfs_brec_remove(&fd);

	}

	hfs_find_exit(&fd);

	up(&HFSPLUS_I(inode).extents_lock);

	mutex_unlock(&HFSPLUS_I(inode).extents_lock);



	HFSPLUS_I(inode).alloc_blocks = blk_cnt;

out:

fs/hfsplus/hfsplus_fs.h

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define _LINUX_HFSPLUS_FS_H



#include <linux/fs.h>

#include <linux/mutex.h>

#include <linux/buffer_head.h>

#include "hfsplus_raw.h"
@@ -154,7 +155,7 @@ struct hfsplus_sb_info { 




struct hfsplus_inode_info {

	struct semaphore extents_lock;

	struct mutex extents_lock;

	u32 clump_blocks, alloc_blocks;

	sector_t fs_blocks;

	/* Allocation extents from catalog record or volume header */

fs/hfsplus/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static struct dentry *hfsplus_file_lookup(struct inode *dir, struct dentry *dent 


	inode->i_ino = dir->i_ino;

	INIT_LIST_HEAD(&HFSPLUS_I(inode).open_dir_list);

	init_MUTEX(&HFSPLUS_I(inode).extents_lock);

	mutex_init(&HFSPLUS_I(inode).extents_lock);

	HFSPLUS_I(inode).flags = HFSPLUS_FLG_RSRC;



	hfs_find_init(HFSPLUS_SB(sb).cat_tree, &fd);
@@ -316,7 +316,7 @@ struct inode *hfsplus_new_inode(struct super_block *sb, int mode) 
	inode->i_nlink = 1;

	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;

	INIT_LIST_HEAD(&HFSPLUS_I(inode).open_dir_list);

	init_MUTEX(&HFSPLUS_I(inode).extents_lock);

	mutex_init(&HFSPLUS_I(inode).extents_lock);

	atomic_set(&HFSPLUS_I(inode).opencnt, 0);

	HFSPLUS_I(inode).flags = 0;

	memset(HFSPLUS_I(inode).first_extents, 0, sizeof(hfsplus_extent_rec));

fs/hfsplus/super.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct inode *hfsplus_iget(struct super_block *sb, unsigned long ino) 
		return inode;



	INIT_LIST_HEAD(&HFSPLUS_I(inode).open_dir_list);

	init_MUTEX(&HFSPLUS_I(inode).extents_lock);

	mutex_init(&HFSPLUS_I(inode).extents_lock);

	HFSPLUS_I(inode).flags = 0;

	HFSPLUS_I(inode).rsrc_inode = NULL;

	atomic_set(&HFSPLUS_I(inode).opencnt, 0);