diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-20 09:35:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-20 09:35:05 -0800 |
| commit | fc7e13104f823d1ea9c1f4dd7531c14b0c1e6e7e (patch) | |
| tree | 489070a6f39a062c7f51cab3cb4c976810eb7556 /fs/lockd/clntlock.c | |
| parent | 33c37c06f8066342764bd1568c9f3524efe889a5 (diff) | |
| parent | 9b5b1f5bf9dcdb6f23abf65977a675eb4deba3c0 (diff) | |
| download | linux-fc7e13104f823d1ea9c1f4dd7531c14b0c1e6e7e.tar.gz linux-fc7e13104f823d1ea9c1f4dd7531c14b0c1e6e7e.tar.xz | |
Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'fs/lockd/clntlock.c')
| -rw-r--r-- | fs/lockd/clntlock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c index 006bb9e14579..3eaf6e701087 100644 --- a/fs/lockd/clntlock.c +++ b/fs/lockd/clntlock.c @@ -157,6 +157,8 @@ void nlmclnt_mark_reclaim(struct nlm_host *host) inode = fl->fl_file->f_dentry->d_inode; if (inode->i_sb->s_magic != NFS_SUPER_MAGIC) continue; + if (fl->fl_u.nfs_fl.owner == NULL) + continue; if (fl->fl_u.nfs_fl.owner->host != host) continue; if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_GRANTED)) @@ -226,6 +228,8 @@ restart: inode = fl->fl_file->f_dentry->d_inode; if (inode->i_sb->s_magic != NFS_SUPER_MAGIC) continue; + if (fl->fl_u.nfs_fl.owner == NULL) + continue; if (fl->fl_u.nfs_fl.owner->host != host) continue; if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_RECLAIM)) |