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

Commit 869a9d37 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

NFSv4.1 Fail data server I/O if stateid represents a lost lock 



Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Link: http://lkml.kernel.org/r/1393954269-3974-1-git-send-email-andros@netapp.com


Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 927864cd

fs/nfs/nfs4filelayout.c

+6 −4
Original line number Diff line number Diff line
@@ -324,8 +324,9 @@ static void filelayout_read_prepare(struct rpc_task *task, void *data) 
			&rdata->res.seq_res,

			task))

		return;

	nfs4_set_rw_stateid(&rdata->args.stateid, rdata->args.context,

			rdata->args.lock_context, FMODE_READ);

	if (nfs4_set_rw_stateid(&rdata->args.stateid, rdata->args.context,

			rdata->args.lock_context, FMODE_READ) == -EIO)

		rpc_exit(task, -EIO); /* lost lock, terminate I/O */

}



static void filelayout_read_call_done(struct rpc_task *task, void *data)
@@ -435,8 +436,9 @@ static void filelayout_write_prepare(struct rpc_task *task, void *data) 
			&wdata->res.seq_res,

			task))

		return;

	nfs4_set_rw_stateid(&wdata->args.stateid, wdata->args.context,

			wdata->args.lock_context, FMODE_WRITE);

	if (nfs4_set_rw_stateid(&wdata->args.stateid, wdata->args.context,

			wdata->args.lock_context, FMODE_WRITE) == -EIO)

		rpc_exit(task, -EIO); /* lost lock, terminate I/O */

}



static void filelayout_write_call_done(struct rpc_task *task, void *data)