From 3ca32140e38438b71f3d954728f0f81b0633541f Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 19 Dec 2005 17:11:25 -0500 Subject: [PATCH] --- yaml --- r: 15259 b: refs/heads/master c: 9b5b1f5bf9dcdb6f23abf65977a675eb4deba3c0 h: refs/heads/master i: 15257: 7a156e5d694401b27f0bba9b6fa8c650402ee5ce 15255: a95e7dd994a15c3a3ad880cea2ccde7f3d18a0bb v: v3 --- [refs] | 2 +- trunk/fs/lockd/clntlock.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 38b80c669bde..ec1a0946da60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48e49187753ec3b4fa84a7165c9b7a59f3875b56 +refs/heads/master: 9b5b1f5bf9dcdb6f23abf65977a675eb4deba3c0 diff --git a/trunk/fs/lockd/clntlock.c b/trunk/fs/lockd/clntlock.c index 006bb9e14579..3eaf6e701087 100644 --- a/trunk/fs/lockd/clntlock.c +++ b/trunk/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 @@ reclaimer(void *ptr) 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))