Skip to content

L
linux-davinci-2.6.23
Commit 43b2a33a authored by Trond Myklebust's avatar Trond Myklebust
Browse files
Options

NFSv4: Fix recovery of flock() locks. 

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 34ea8188
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
fs/nfs/nfs4state.c
View file @ 43b2a33a
...@@ -784,7 +784,7 @@ static int nfs4_reclaim_locks(struct nfs4_state_recovery_ops *ops, struct nfs4_s ...@@ -784,7 +784,7 @@ static int nfs4_reclaim_locks(struct nfs4_state_recovery_ops *ops, struct nfs4_s
int status = 0; int status = 0;
for (fl = inode->i_flock; fl != 0; fl = fl->fl_next) { 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; continue;
if (((struct nfs_open_context *)fl->fl_file->private_data)->state != state) if (((struct nfs_open_context *)fl->fl_file->private_data)->state != state)
continue; continue;
...@@ -799,7 +799,7 @@ static int nfs4_reclaim_locks(struct nfs4_state_recovery_ops *ops, struct nfs4_s ...@@ -799,7 +799,7 @@ static int nfs4_reclaim_locks(struct nfs4_state_recovery_ops *ops, struct nfs4_s
case -NFS4ERR_NO_GRACE: case -NFS4ERR_NO_GRACE:
case -NFS4ERR_RECLAIM_BAD: case -NFS4ERR_RECLAIM_BAD:
case -NFS4ERR_RECLAIM_CONFLICT: case -NFS4ERR_RECLAIM_CONFLICT:
/* kill_proc(fl->fl_owner, SIGLOST, 1); */ /* kill_proc(fl->fl_pid, SIGLOST, 1); */
break; break;
case -NFS4ERR_STALE_CLIENTID: case -NFS4ERR_STALE_CLIENTID:
goto out_err; goto out_err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment