diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-03-15 11:44:18 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-03-15 11:44:18 +1100 |
| commit | 355cced45286ed7e710058174066628ff9ad9fa4 (patch) | |
| tree | d65ab254733c0930903649e73b41ca97a98a0036 /fs/xfs | |
| parent | cc07eed8336d6452214d13e0cba770a0f5296a7f (diff) | |
| download | linux-355cced45286ed7e710058174066628ff9ad9fa4.tar.gz linux-355cced45286ed7e710058174066628ff9ad9fa4.tar.bz2 linux-355cced45286ed7e710058174066628ff9ad9fa4.zip | |
xfs: always set rvalp in xfs_dir2_node_trim_free
xfs_dir2_node_trim_free can return with setting the rvalp argument
pointer. Initialize it to 0 at the beginning of the function and
only update it to 1 if we succeeded trimming a freespace block.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
| -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; } /* |