Commit 55534c09 authored by Markus Elfring's avatar Markus Elfring Committed by Andreas Gruenbacher
Browse files

gfs2: Move variable assignment behind a null pointer check in inode_go_dump 



Since commit 27a2660f ("gfs2: Dump nrpages for inodes and their
glocks"), inode_go_dump() computes the address of inode within ip before
checking if ip is NULL.  This isn't a bug by itself, but it can give
rise to bugs later.  Avoid that by checking if ip is NULL first.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 130cf526

fs/gfs2/glops.c

+2 −1
Original line number Diff line number Diff line
@@ -535,12 +535,13 @@ static void inode_go_dump(struct seq_file *seq, struct gfs2_glock *gl, 
			  const char *fs_id_buf)

{

	struct gfs2_inode *ip = gl->gl_object;

	struct inode *inode = &ip->i_inode;

	struct inode *inode;

	unsigned long nrpages;



	if (ip == NULL)

		return;



	inode = &ip->i_inode;

	xa_lock_irq(&inode->i_data.i_pages);

	nrpages = inode->i_data.nrpages;

	xa_unlock_irq(&inode->i_data.i_pages);