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

Commit 4e590803 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Allow getdeviceinfo to return notification info back to caller 



We are only allowed to cache deviceinfo if the server supports notifications
and actually promises to call us back when changes occur. Right now, we
request those notifications, but then we don't check the server's reply.

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

fs/nfs/nfs4proc.c

+5 −0
Original line number Diff line number Diff line
@@ -7944,6 +7944,8 @@ _nfs4_proc_getdeviceinfo(struct nfs_server *server, 
{

	struct nfs4_getdeviceinfo_args args = {

		.pdev = pdev,

		.notify_types = NOTIFY_DEVICEID4_CHANGE |

			NOTIFY_DEVICEID4_DELETE,

	};

	struct nfs4_getdeviceinfo_res res = {

		.pdev = pdev,
@@ -7958,6 +7960,9 @@ _nfs4_proc_getdeviceinfo(struct nfs_server *server, 


	dprintk("--> %s\n", __func__);

	status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 0);

	if (res.notification & ~args.notify_types)

		dprintk("%s: unsupported notification\n", __func__);



	dprintk("<-- %s status=%d\n", __func__, status);



	return status;

fs/nfs/nfs4xdr.c

+5 −9
Original line number Diff line number Diff line
@@ -1920,7 +1920,7 @@ encode_getdeviceinfo(struct xdr_stream *xdr, 


	p = reserve_space(xdr, 4 + 4);

	*p++ = cpu_to_be32(1);			/* bitmap length */

	*p++ = cpu_to_be32(NOTIFY_DEVICEID4_CHANGE | NOTIFY_DEVICEID4_DELETE);

	*p++ = cpu_to_be32(args->notify_types);

}



static void
@@ -5753,8 +5753,9 @@ static int decode_sequence(struct xdr_stream *xdr, 


#if defined(CONFIG_NFS_V4_1)

static int decode_getdeviceinfo(struct xdr_stream *xdr,

				struct pnfs_device *pdev)

				struct nfs4_getdeviceinfo_res *res)

{

	struct pnfs_device *pdev = res->pdev;

	__be32 *p;

	uint32_t len, type;

	int status;
@@ -5802,12 +5803,7 @@ static int decode_getdeviceinfo(struct xdr_stream *xdr, 
		if (unlikely(!p))

			goto out_overflow;



		if (be32_to_cpup(p++) &

		    ~(NOTIFY_DEVICEID4_CHANGE | NOTIFY_DEVICEID4_DELETE)) {

			dprintk("%s: unsupported notification\n",

				__func__);

		}



		res->notification = be32_to_cpup(p++);

		for (i = 1; i < len; i++) {

			if (be32_to_cpup(p++)) {

				dprintk("%s: unsupported notification\n",
@@ -7061,7 +7057,7 @@ static int nfs4_xdr_dec_getdeviceinfo(struct rpc_rqst *rqstp, 
	status = decode_sequence(xdr, &res->seq_res, rqstp);

	if (status != 0)

		goto out;

	status = decode_getdeviceinfo(xdr, res->pdev);

	status = decode_getdeviceinfo(xdr, res);

out:

	return status;

}

include/linux/nfs_xdr.h

+2 −0
Original line number Diff line number Diff line
@@ -255,11 +255,13 @@ struct nfs4_layoutget { 
struct nfs4_getdeviceinfo_args {

	struct nfs4_sequence_args seq_args;

	struct pnfs_device *pdev;

	__u32 notify_types;

};



struct nfs4_getdeviceinfo_res {

	struct nfs4_sequence_res seq_res;

	struct pnfs_device *pdev;

	__u32 notification;

};



struct nfs4_layoutcommit_args {