summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/ops_inode.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2007-01-25 17:14:59 +0000
committerSteven Whitehouse <swhiteho@redhat.com>2007-02-05 13:37:53 -0500
commitd7c103d0bd29c94f78155a4538faf314e49d9713 (patch)
tree62c453ffe7d6d4637aa93dd43dbb0665175f644c /fs/gfs2/ops_inode.c
parentb790c3b7c38aae28c497bb363a6fe72f7c96568f (diff)
downloadop-kernel-dev-d7c103d0bd29c94f78155a4538faf314e49d9713.zip
op-kernel-dev-d7c103d0bd29c94f78155a4538faf314e49d9713.tar.gz
[GFS2] Fix recursive locking attempt with NFS
In certain cases, its possible for NFS to call the lookup code while holding the glock (when doing a readdirplus operation) so we need to check for that and not try and lock the glock twice. This also fixes a typo in a previous NFS related GFS2 patch. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/ops_inode.c')
-rw-r--r--fs/gfs2/ops_inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 747c731..5591f89 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -1018,7 +1018,7 @@ static int gfs2_getattr(struct vfsmount *mnt, struct dentry *dentry,
}
generic_fillattr(inode, stat);
- if (unlock);
+ if (unlock)
gfs2_glock_dq_uninit(&gh);
return 0;
OpenPOWER on IntegriCloud