[Cluster-devel] [GFS2 PATCH] gfs2: use inode_lock/unlock instead of accessing i_mutex directly

[Cluster-devel] [GFS2 PATCH] gfs2: use inode_lock/unlock instead of accessing i_mutex directly

[Abhi Das]

i_mutex has been replaced by i_rwsem and directly accessing the
non-existent i_mutex breaks the kernel build.

Signed-off-by: Abhi Das <adas@redhat.com>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
CC: Al Viro <viro@ZenIV.linux.org.uk>
---
 fs/gfs2/file.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index f33fd92..374dd53 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -960,16 +960,16 @@ static ssize_t gfs2_file_splice_read(struct file *in, loff_t *ppos,
 	struct gfs2_holder gh;
 	int ret;
 
-	mutex_lock(&inode->i_mutex);
+	inode_lock(inode);
 
 	ret = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, 0, &gh);
 	if (ret) {
-		mutex_unlock(&inode->i_mutex);
+		inode_unlock(inode);
 		return ret;
 	}
 
 	gfs2_glock_dq_uninit(&gh);
-	mutex_unlock(&inode->i_mutex);
+	inode_unlock(inode);
 
 	return generic_file_splice_read(in, ppos, pipe, len, flags);
 }
-- 
2.4.3

[Cluster-devel] [GFS2 PATCH] gfs2: use inode_lock/unlock instead of accessing i_mutex directly

[Bob Peterson]

----- Original Message -----
> i_mutex has been replaced by i_rwsem and directly accessing the
> non-existent i_mutex breaks the kernel build.
> 
> Signed-off-by: Abhi Das <adas@redhat.com>
> CC: Stephen Rothwell <sfr@canb.auug.org.au>
> CC: Al Viro <viro@ZenIV.linux.org.uk>
> ---

Hi Abhi,

Thanks. This 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=80f4781d2c0ba63bf9ab4de90a6829a1368b80a3

Regards,

Bob Peterson
Red Hat File Systems