lkml.org 
[lkml]   [2008]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch 2/2] 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: Matthias Kaehlcke <matthias@kaehlcke.net>

Index: hfs/btree.c
===================================================================
--- hfs.orig/btree.c 2008-05-11 19:28:16.000000000 +0200
+++ hfs/btree.c 2008-05-11 19:28:46.000000000 +0200
@@ -40,7 +40,7 @@
{
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,
Index: hfs/extent.c
===================================================================
--- hfs.orig/extent.c 2008-05-11 19:28:16.000000000 +0200
+++ hfs/extent.c 2008-05-11 19:29:43.000000000 +0200
@@ -343,16 +343,16 @@
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 @@
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 @@
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 @@
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 @@
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:
Index: hfs/hfs_fs.h
===================================================================
--- hfs.orig/hfs_fs.h 2008-05-11 19:28:17.000000000 +0200
+++ hfs/hfs_fs.h 2008-05-11 19:30:11.000000000 +0200
@@ -54,7 +54,7 @@
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;
Index: hfs/inode.c
===================================================================
--- hfs.orig/inode.c 2008-05-11 19:28:17.000000000 +0200
+++ hfs/inode.c 2008-05-11 19:30:44.000000000 +0200
@@ -150,7 +150,7 @@
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 @@

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 */
--
Matthias Kaehlcke
Embedded Linux Engineer
Barcelona

We build too many walls and not enough bridges
(Isaac Newton)
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
`. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-

\
 
 \ /
  Last update: 2008-05-11 19:49    [W:0.113 / U:0.252 seconds]
©2003-2011 Jasper Spaans. Advertise on this site