diff options
author | Joel Becker <joel.becker@oracle.com> | 2007-03-28 21:27:07 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2007-05-02 18:07:42 -0400 |
commit | ee19a77956cb65c5da54d85a5efefe50b39fa6e5 (patch) | |
tree | 1ce4410333f2ad72460cb742d3f5974acb6f9caa /fs/ocfs2/inode.c | |
parent | 6cb129f5675c39944e5fe18fd2530a2eb771b754 (diff) |
ocfs2: Wrap access of directory allocations with ip_alloc_sem.
OCFS2_I(inode)->ip_alloc_sem is a read-write semaphore protecting
local concurrent access of ocfs2 inodes. However, ocfs2 directories were
not taking the semaphore while they accessed or modified the allocation
tree.
ocfs2_extend_dir() needs to take the semaphore in a write mode when it
adds to the allocation. All other directory users get there via
ocfs2_bread(), which takes the semaphore in read mode.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/inode.c')
-rw-r--r-- | fs/ocfs2/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 21a605079c62..58ec54b60038 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c | |||
@@ -1106,8 +1106,10 @@ struct buffer_head *ocfs2_bread(struct inode *inode, | |||
1106 | return NULL; | 1106 | return NULL; |
1107 | } | 1107 | } |
1108 | 1108 | ||
1109 | down_read(&OCFS2_I(inode)->ip_alloc_sem); | ||
1109 | tmperr = ocfs2_extent_map_get_blocks(inode, block, &p_blkno, NULL, | 1110 | tmperr = ocfs2_extent_map_get_blocks(inode, block, &p_blkno, NULL, |
1110 | NULL); | 1111 | NULL); |
1112 | up_read(&OCFS2_I(inode)->ip_alloc_sem); | ||
1111 | if (tmperr < 0) { | 1113 | if (tmperr < 0) { |
1112 | mlog_errno(tmperr); | 1114 | mlog_errno(tmperr); |
1113 | goto fail; | 1115 | goto fail; |