diff options
| author | Nathan Scott <nathans@bruce> | 2006-03-22 14:12:12 +1100 |
|---|---|---|
| committer | Nathan Scott <nathans@bruce> | 2006-03-22 14:12:12 +1100 |
| commit | bb19fba1937cb6ab2bb98ac893365f6ebf88ef1b (patch) | |
| tree | ef24ffdf7903206c4bc0432ce91d2627bffdf714 /fs/xfs/xfs_vnodeops.c | |
| parent | e15f195cfb2fb1f2af0fdfc21277643deb26c0df (diff) | |
| download | kernel_samsung_smdk4412-bb19fba1937cb6ab2bb98ac893365f6ebf88ef1b.zip kernel_samsung_smdk4412-bb19fba1937cb6ab2bb98ac893365f6ebf88ef1b.tar.gz kernel_samsung_smdk4412-bb19fba1937cb6ab2bb98ac893365f6ebf88ef1b.tar.bz2 | |
[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 697bf22..a478f42 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -3187,7 +3187,7 @@ xfs_rmdir( /* Fall through to std_return with error = 0 or the errno * from xfs_trans_commit. */ -std_return: + std_return: if (DM_EVENT_ENABLED(dir_vp->v_vfsp, dp, DM_EVENT_POSTREMOVE)) { (void) XFS_SEND_NAMESP(mp, DM_EVENT_POSTREMOVE, dir_vp, DM_RIGHT_NULL, @@ -3197,12 +3197,12 @@ std_return: } return error; -error1: + error1: xfs_bmap_cancel(&free_list); cancel_flags |= XFS_TRANS_ABORT; /* FALLTHROUGH */ -error_return: + error_return: xfs_trans_cancel(tp, cancel_flags); goto std_return; } |