Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43b2a33a authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix recovery of flock() locks. 


 Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 34ea8188

fs/nfs/nfs4state.c

+2 −2
Original line number Diff line number Diff line
@@ -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;