[PATCH 2/8] xfsprogs: unconditionally drop used buffer reference

Alex Elder aelder at sgi.com
Thu Nov 10 14:35:12 CST 2011


In libxfs_mount(), after reading the last block in the log device,
the buffer is released by a call to libxfs_putbuf().  But it's done
only if bp is non-null.  It always will be non-null at this point,
so just make the call unconditionally.

Also touch up a misleading indent.

Signed-off-by: Alex Elder <aelder at sgi.com>
---
 libxfs/init.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libxfs/init.c b/libxfs/init.c
index 08fc584..ba44c9b 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -743,15 +743,14 @@ libxfs_mount(
 			if (!(flags & LIBXFS_MOUNT_DEBUGGER))
 				return NULL;
 		}
-		if (bp)
-			libxfs_putbuf(bp);
+		libxfs_putbuf(bp);
 	}
 
 	/* Initialize realtime fields in the mount structure */
 	if (rtmount_init(mp, flags)) {
 		fprintf(stderr, _("%s: realtime device init failed\n"),
 			progname);
-			return NULL;
+		return NULL;
 	}
 
 	error = libxfs_initialize_perag(mp, sbp->sb_agcount, &mp->m_maxagi);
-- 
1.7.6.4




More information about the xfs mailing list