[Cluster-devel] [PATCH] GFS2: Add calls to gfs2_holder_uninit in two error handlers

[Cluster-devel] [PATCH] GFS2: Add calls to gfs2_holder_uninit in two error handlers

[Daniel DeFreez]

This is a follow-up patch to the question I asked yesterday. These are
the two locations I am aware of that do not call gfs2_holder_uninit if
gfs2_glock_nq returns an error.

Signed-off-by: Daniel DeFreez <dcdefreez@ucdavis.edu>
---
 fs/gfs2/aops.c | 3 ++-
 fs/gfs2/file.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index 1bbbee9..68100df 100644
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -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;
 }
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 208efc7..97443fc 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -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;
 }
-- 
2.7.3

[Cluster-devel] [PATCH] GFS2: Add calls to gfs2_holder_uninit in two error handlers

[Bob Peterson]

----- Original Message -----
> This is a follow-up patch to the question I asked yesterday. These are
> the two locations I am aware of that do not call gfs2_holder_uninit if
> gfs2_glock_nq returns an error.
> 
> Signed-off-by: Daniel DeFreez <dcdefreez@ucdavis.edu>

Hi Daniel,

Your patch looks good. I'm currently at the LSF conference, so I'm
a bit distracted this week, but hopefully I'll push it to the upstream
repository soon.

Regards,

Bob Peterson
Red Hat File Systems

[Cluster-devel] [PATCH] GFS2: Add calls to gfs2_holder_uninit in two error handlers

[Bob Peterson]

----- Original Message -----
> This is a follow-up patch to the question I asked yesterday. These are
> the two locations I am aware of that do not call gfs2_holder_uninit if
> gfs2_glock_nq returns an error.
> 
> Signed-off-by: Daniel DeFreez <dcdefreez@ucdavis.edu>

Hi Daniel,

Thanks. Your patch is now applied to the for-next branch of the linux-gfs2 tree:
https://git.kernel.org/cgit/linux/kernel/git/gfs2/linux-gfs2.git/commit/fs/gfs2?h=for-next&id=9c7fe83530a351845719acf1dda0587e8c743588

Regards,

Bob Peterson
Red Hat File Systems