leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[GFS2] Fix recursive locking in gfs2_getattr

Browse Source 
The readdirplus NFS operation can result in gfs2_getattr being
called with the glock already held. In this case we do not want
to try and grab the lock again.

This fixes Red Hat bugzilla #215727

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Steven Whitehouse 2006-11-27 10:12:05 -05:00
parent 300c7d75f3
commit dcf3dd852f
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/gfs2/ops_inode.c
View File

@ -992,6 +992,12 @@ out:
* @dentry: The dentry to stat * @dentry: The dentry to stat
* @stat: The inode's stats * @stat: The inode's stats
* *
* This may be called from the VFS directly, or from within GFS2 with the
* inode locked, so we look to see if the glock is already locked and only
* lock the glock if its not already been done. Note that its the NFS
* readdirplus operation which causes this to be called (from filldir)
* with the glock already held.
*
* Returns: errno * Returns: errno
*/ */
@ -1002,14 +1008,20 @@ static int gfs2_getattr(struct vfsmount *mnt, struct dentry *dentry,
struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_holder gh; struct gfs2_holder gh;
int error; int error;
int unlock = 0;
error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &gh); if (gfs2_glock_is_locked_by_me(ip->i_gl) == 0) {
if (!error) { error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &gh);
generic_fillattr(inode, stat); if (error)
gfs2_glock_dq_uninit(&gh); return error;
unlock = 1;
} }
return error; generic_fillattr(inode, stat);
if (unlock);
gfs2_glock_dq_uninit(&gh);
return 0;
} }
static int gfs2_setxattr(struct dentry *dentry, const char *name, static int gfs2_setxattr(struct dentry *dentry, const char *name,