diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-03-15 11:44:35 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-03-15 11:44:35 +1100 |
| commit | 2cdb958aba6afbced5bc563167813b972b6acbfe (patch) | |
| tree | 1ad9f3ec2753f80e94e62353ffd5d80d24c3c8f9 /fs/xfs/libxfs/xfs_dir2_node.c | |
| parent | ab9d1e4f7b0217948a3b35a64178602ab30ff45d (diff) | |
| parent | 355cced45286ed7e710058174066628ff9ad9fa4 (diff) | |
| download | linux-2cdb958aba6afbced5bc563167813b972b6acbfe.tar.gz | |
Merge branch 'xfs-misc-fixes-4.6-4' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_dir2_node.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_dir2_node.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index 63ee03db796c..75a557432d0f 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c @@ -2235,6 +2235,9 @@ xfs_dir2_node_trim_free( dp = args->dp; tp = args->trans; + + *rvalp = 0; + /* * Read the freespace block. */ @@ -2255,7 +2258,6 @@ xfs_dir2_node_trim_free( */ if (freehdr.nused > 0) { xfs_trans_brelse(tp, bp); - *rvalp = 0; return 0; } /* |