diff options
author | Nathan Scott <nathans@bruce> | 2006-03-21 22:12:12 -0500 |
---|---|---|
committer | Nathan Scott <nathans@bruce> | 2006-03-21 22:12:12 -0500 |
commit | bb19fba1937cb6ab2bb98ac893365f6ebf88ef1b (patch) | |
tree | ef24ffdf7903206c4bc0432ce91d2627bffdf714 /fs/xfs/xfs_vnodeops.c | |
parent | e15f195cfb2fb1f2af0fdfc21277643deb26c0df (diff) |
[XFS] Sync up one/two other minor changes missed in previous merges.
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_vnodeops.c')
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 697bf22a84f3..a478f42e63ff 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -3187,7 +3187,7 @@ xfs_rmdir( | |||
3187 | 3187 | ||
3188 | /* Fall through to std_return with error = 0 or the errno | 3188 | /* Fall through to std_return with error = 0 or the errno |
3189 | * from xfs_trans_commit. */ | 3189 | * from xfs_trans_commit. */ |
3190 | std_return: | 3190 | std_return: |
3191 | if (DM_EVENT_ENABLED(dir_vp->v_vfsp, dp, DM_EVENT_POSTREMOVE)) { | 3191 | if (DM_EVENT_ENABLED(dir_vp->v_vfsp, dp, DM_EVENT_POSTREMOVE)) { |
3192 | (void) XFS_SEND_NAMESP(mp, DM_EVENT_POSTREMOVE, | 3192 | (void) XFS_SEND_NAMESP(mp, DM_EVENT_POSTREMOVE, |
3193 | dir_vp, DM_RIGHT_NULL, | 3193 | dir_vp, DM_RIGHT_NULL, |
@@ -3197,12 +3197,12 @@ std_return: | |||
3197 | } | 3197 | } |
3198 | return error; | 3198 | return error; |
3199 | 3199 | ||
3200 | error1: | 3200 | error1: |
3201 | xfs_bmap_cancel(&free_list); | 3201 | xfs_bmap_cancel(&free_list); |
3202 | cancel_flags |= XFS_TRANS_ABORT; | 3202 | cancel_flags |= XFS_TRANS_ABORT; |
3203 | /* FALLTHROUGH */ | 3203 | /* FALLTHROUGH */ |
3204 | 3204 | ||
3205 | error_return: | 3205 | error_return: |
3206 | xfs_trans_cancel(tp, cancel_flags); | 3206 | xfs_trans_cancel(tp, cancel_flags); |
3207 | goto std_return; | 3207 | goto std_return; |
3208 | } | 3208 | } |