diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2007-01-25 18:14:59 +0100 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-02-05 19:37:53 +0100 |
| commit | d7c103d0bd29c94f78155a4538faf314e49d9713 (patch) | |
| tree | 62c453ffe7d6d4637aa93dd43dbb0665175f644c /fs/gfs2/ops_inode.c | |
| parent | [DLM] can miss clearing resend flag (diff) | |
| download | linux-d7c103d0bd29c94f78155a4538faf314e49d9713.tar.xz linux-d7c103d0bd29c94f78155a4538faf314e49d9713.zip | |
[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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index 747c7316f5cc..5591f8905cf7 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; |