diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-11-04 15:35:30 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-11-04 15:35:30 -0500 |
| commit | 43b2a33aa868054bd477ab2c1cd20f1ba1af2c3e (patch) | |
| tree | f22ad362b9f877dfd4bc44139894a045aa48059a /fs/nfs | |
| parent | 34ea818846e6cccdd6e05354ab8c8a6d7e34657a (diff) | |
| download | op-kernel-dev-43b2a33aa868054bd477ab2c1cd20f1ba1af2c3e.zip op-kernel-dev-43b2a33aa868054bd477ab2c1cd20f1ba1af2c3e.tar.gz | |
NFSv4: Fix recovery of flock() locks.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 81d964b..52a26ba 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -784,7 +784,7 @@ static int nfs4_reclaim_locks(struct nfs4_state_recovery_ops *ops, struct nfs4_s int status = 0; for (fl = inode->i_flock; fl != 0; fl = fl->fl_next) { - if (!(fl->fl_flags & FL_POSIX)) + if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK))) continue; if (((struct nfs_open_context *)fl->fl_file->private_data)->state != state) continue; @@ -799,7 +799,7 @@ static int nfs4_reclaim_locks(struct nfs4_state_recovery_ops *ops, struct nfs4_s case -NFS4ERR_NO_GRACE: case -NFS4ERR_RECLAIM_BAD: case -NFS4ERR_RECLAIM_CONFLICT: - /* kill_proc(fl->fl_owner, SIGLOST, 1); */ + /* kill_proc(fl->fl_pid, SIGLOST, 1); */ break; case -NFS4ERR_STALE_CLIENTID: goto out_err; |
