summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_symlink.c
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@sandeen.net>2014-09-09 11:57:52 +1000
committerDave Chinner <david@fromorbit.com>2014-09-09 11:57:52 +1000
commit94f3cad555d66048906deade06a764f7ea2c6e4d (patch)
tree537cfbb0bcdacfb55f027cac223d6a2e35e358d5 /fs/xfs/xfs_symlink.c
parent970fd3f04d5949a4b5f6d0a5fea8e4b6797a5992 (diff)
downloadlinux-94f3cad555d66048906deade06a764f7ea2c6e4d.tar.gz
linux-94f3cad555d66048906deade06a764f7ea2c6e4d.tar.bz2
linux-94f3cad555d66048906deade06a764f7ea2c6e4d.zip
xfs: check resblks before calling xfs_dir_canenter
Move the resblks test out of the xfs_dir_canenter, and into the caller. This makes a little more sense on the face of it; xfs_dir_canenter immediately returns if resblks !=0; and given some of the comments preceding the calls: * Check for ability to enter directory entry, if no space reserved. even more so. It also facilitates the next patch. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_symlink.c')
-rw-r--r--fs/xfs/xfs_symlink.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c
index 6a944a2cd36f..02ae62a998e0 100644
--- a/fs/xfs/xfs_symlink.c
+++ b/fs/xfs/xfs_symlink.c
@@ -269,9 +269,11 @@ xfs_symlink(
/*
* Check for ability to enter directory entry, if no space reserved.
*/
- error = xfs_dir_canenter(tp, dp, link_name, resblks);
- if (error)
- goto error_return;
+ if (!resblks) {
+ error = xfs_dir_canenter(tp, dp, link_name);
+ if (error)
+ goto error_return;
+ }
/*
* Initialize the bmap freelist prior to calling either
* bmapi or the directory create code.