aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.com>2015-07-28 21:52:08 -0400
committerDave Chinner <david@fromorbit.com>2015-07-28 21:52:08 -0400
commitd6077aa339d6580d12bd1089231eea2940383e32 (patch)
tree2c4cdff837c8ce719c54ce064aca5e839abbc506
parentf41febd2eb5bdaa1c5685fe8a9b09276645013bc (diff)
xfs: Remove duplicate jumps to the same label
xfs_create() and xfs_create_tmpfile() have useless jumps to identical labels. Simplify them. Signed-off-by: Jan Kara <jack@suse.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
-rw-r--r--fs/xfs/xfs_inode.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 3da9f4da4f3d..d22a984d8470 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1175,11 +1175,8 @@ xfs_create(
1175 */ 1175 */
1176 error = xfs_dir_ialloc(&tp, dp, mode, is_dir ? 2 : 1, rdev, 1176 error = xfs_dir_ialloc(&tp, dp, mode, is_dir ? 2 : 1, rdev,
1177 prid, resblks > 0, &ip, &committed); 1177 prid, resblks > 0, &ip, &committed);
1178 if (error) { 1178 if (error)
1179 if (error == -ENOSPC)
1180 goto out_trans_cancel;
1181 goto out_trans_cancel; 1179 goto out_trans_cancel;
1182 }
1183 1180
1184 /* 1181 /*
1185 * Now we join the directory inode to the transaction. We do not do it 1182 * Now we join the directory inode to the transaction. We do not do it
@@ -1318,11 +1315,8 @@ xfs_create_tmpfile(
1318 1315
1319 error = xfs_dir_ialloc(&tp, dp, mode, 1, 0, 1316 error = xfs_dir_ialloc(&tp, dp, mode, 1, 0,
1320 prid, resblks > 0, &ip, NULL); 1317 prid, resblks > 0, &ip, NULL);
1321 if (error) { 1318 if (error)
1322 if (error == -ENOSPC)
1323 goto out_trans_cancel;
1324 goto out_trans_cancel; 1319 goto out_trans_cancel;
1325 }
1326 1320
1327 if (mp->m_flags & XFS_MOUNT_WSYNC) 1321 if (mp->m_flags & XFS_MOUNT_WSYNC)
1328 xfs_trans_set_sync(tp); 1322 xfs_trans_set_sync(tp);