diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-21 04:38:01 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-21 04:38:01 -0500 |
| commit | d8bcd8e41576809f276fa44be5012568296cce41 (patch) | |
| tree | ec48438ed1a7b3d3794a0a4cc577d0bab69b7f03 /fs/lockd | |
| parent | 5b2db367a28c12e8dfd0b404d9ea35e948c5d7b3 (diff) | |
| parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) | |
| download | op-kernel-dev-d8bcd8e41576809f276fa44be5012568296cce41.zip op-kernel-dev-d8bcd8e41576809f276fa44be5012568296cce41.tar.gz | |
Auto-update from upstream
Diffstat (limited to 'fs/lockd')
| -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 006bb9e..3eaf6e7 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)) |
