diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2010-11-16 10:09:42 +0100 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-11-16 10:09:42 +0100 |
commit | a02056349cdea2252cd2b21643ebf025e83a29f2 (patch) | |
tree | b7c889d6cbe8e7188d07d99a5c9da858c53a5b6c /fs/hfs/btree.h | |
parent | block: export 'ro' sysfs attribute for partitions (diff) | |
parent | Linux 2.6.37-rc2 (diff) | |
download | linux-a02056349cdea2252cd2b21643ebf025e83a29f2.tar.xz linux-a02056349cdea2252cd2b21643ebf025e83a29f2.zip |
Merge branch 'v2.6.37-rc2' into for-2.6.38/core
Diffstat (limited to 'fs/hfs/btree.h')
-rw-r--r-- | fs/hfs/btree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfs/btree.h b/fs/hfs/btree.h index cc51905ac21d..2a1d712f85dc 100644 --- a/fs/hfs/btree.h +++ b/fs/hfs/btree.h @@ -33,7 +33,7 @@ struct hfs_btree { unsigned int depth; //unsigned int map1_size, map_size; - struct semaphore tree_lock; + struct mutex tree_lock; unsigned int pages_per_bnode; spinlock_t hash_lock; |