---

yaml --- r: 15259 b: refs/heads/master c: 9b5b1f5 h: refs/heads/master i: 15257: 7a156e5 15255: a95e7dd v: v3
git-mirror · Dec 20, 2005 · 3ca3214 · 3ca3214
1 parent afe2b77
commit 3ca3214
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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))