xfs
[Top] [All Lists]

[PATCH] xfs: always set rvalp in xfs_dir2_node_trim_free

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfs: always set rvalp in xfs_dir2_node_trim_free
From: Christoph Hellwig <hch@xxxxxx>
Date: Fri, 11 Mar 2016 10:42:17 +0100
Delivered-to: xfs@xxxxxxxxxxx
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.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
---
 fs/xfs/libxfs/xfs_dir2_node.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
index 63ee03d..75a5574 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;
        }
        /*
-- 
2.1.4

<Prev in Thread] Current Thread [Next in Thread>