]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
[PATCH] ext3: remove unnecessary race then retry in ext3_get_block
authorMingming Cao <cmm@us.ibm.com>
Sun, 1 May 2005 15:59:20 +0000 (08:59 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 1 May 2005 15:59:20 +0000 (08:59 -0700)
commitfe55c452368af263a9beec38ed29f6be85280524
tree4f56bd643c5a9ddbb478745e0bc0fbabc9b9fd8e
parentfaf8b24968ce6392ea68d9afc7de1ffbc38c1f6c
[PATCH] ext3: remove unnecessary race then retry in ext3_get_block

The extra race-with-truncate-then-retry logic around
ext3_get_block_handle(), which was inherited from ext2, becomes unecessary
for ext3, since we have already obtained the ei->truncate_sem in
ext3_get_block_handle() before calling ext3_alloc_branch().  The
ei->truncate_sem is already there to block concurrent truncate and block
allocation on the same inode.  So the inode's indirect addressing tree
won't be changed after we grab that semaphore.

We could, after get the semaphore, re-verify the branch is up-to-date or
not.  If it has been changed, then get the updated branch.  If we still
need block allocation, we will have a safe version of the branch to work
with in the ext3_find_goal()/ext3_splice_branch().

The code becomes more readable after remove those retry logic.  The patch
also clean up some gotos in ext3_get_block_handle() to make it more
readable.

Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
fs/ext3/inode.c