Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c7fe835 authored by Daniel DeFreez's avatar Daniel DeFreez Committed by Bob Peterson
Browse files

GFS2: Add calls to gfs2_holder_uninit in two error handlers 



This patch fixes two locations that do not call gfs2_holder_uninit
if gfs2_glock_nq returns an error.

Signed-off-by: default avatarDaniel DeFreez <dcdefreez@ucdavis.edu>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent e97321fa

fs/gfs2/aops.c

+2 −1
Original line number Diff line number Diff line
@@ -1063,7 +1063,7 @@ static ssize_t gfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter, 
	gfs2_holder_init(ip->i_gl, LM_ST_DEFERRED, 0, &gh);

	rv = gfs2_glock_nq(&gh);

	if (rv)

		return rv;

		goto out_uninit;

	rv = gfs2_ok_for_dio(ip, offset);

	if (rv != 1)

		goto out; /* dio not valid, fall back to buffered i/o */
@@ -1102,6 +1102,7 @@ static ssize_t gfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter, 
				  offset, gfs2_get_block_direct, NULL, NULL, 0);

out:

	gfs2_glock_dq(&gh);

out_uninit:

	gfs2_holder_uninit(&gh);

	return rv;

}

fs/gfs2/file.c

+2 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int gfs2_get_flags(struct file *filp, u32 __user *ptr) 
	gfs2_holder_init(ip->i_gl, LM_ST_SHARED, 0, &gh);

	error = gfs2_glock_nq(&gh);

	if (error)

		return error;

		goto out_uninit;



	fsflags = fsflags_cvt(gfs2_to_fsflags, ip->i_diskflags);

	if (!S_ISDIR(inode->i_mode) && ip->i_diskflags & GFS2_DIF_JDATA)
@@ -169,6 +169,7 @@ static int gfs2_get_flags(struct file *filp, u32 __user *ptr) 
		error = -EFAULT;



	gfs2_glock_dq(&gh);

out_uninit:

	gfs2_holder_uninit(&gh);

	return error;

}