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

Commit 161fb0cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 

* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  SUNRPC: AUTH_SYS "machine creds" shouldn't use negative valued uid/gid
  nfs: make nfs4_drop_state_owner() static
  nfs: path_{get,put}() cleanups
  nfs: replace remaining __FUNCTION__ occurrences
  nfs/lsm: make NFSv4 set LSM mount options
  NFSv4: Check the return value of decode_compound_hdr_arg()
  nfs: fix race in nfs_dirty_request
  NFS: Ensure that 'noac' and/or 'actimeo=0' turn off attribute caching
parents b8291ad0 b4528762

fs/nfs/callback.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp) 
	if (clp == NULL)

		return SVC_DROP;



	dprintk("%s: %s NFSv4 callback!\n", __FUNCTION__,

	dprintk("%s: %s NFSv4 callback!\n", __func__,

			svc_print_addr(rqstp, buf, sizeof(buf)));

	nfs_put_client(clp);

fs/nfs/callback_proc.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ out_iput: 
out_putclient:

	nfs_put_client(clp);

out:

	dprintk("%s: exit with status = %d\n", __FUNCTION__, ntohl(res->status));

	dprintk("%s: exit with status = %d\n", __func__, ntohl(res->status));

	return res->status;

}
@@ -98,6 +98,6 @@ __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy) 
		nfs_put_client(prev);

	} while (clp != NULL);

out:

	dprintk("%s: exit with status = %d\n", __FUNCTION__, ntohl(res));

	dprintk("%s: exit with status = %d\n", __func__, ntohl(res));

	return res;

}

fs/nfs/callback_xdr.c

+20 −20
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound 
	/* We do not like overly long tags! */

	if (hdr->taglen > CB_OP_TAGLEN_MAXSZ - 12) {

		printk("NFSv4 CALLBACK %s: client sent tag of length %u\n",

				__FUNCTION__, hdr->taglen);

				__func__, hdr->taglen);

		return htonl(NFS4ERR_RESOURCE);

	}

	p = read_buf(xdr, 12);
@@ -151,7 +151,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound 
	/* Check minor version is zero. */

	if (minor_version != 0) {

		printk(KERN_WARNING "%s: NFSv4 server callback with illegal minor version %u!\n",

				__FUNCTION__, minor_version);

				__func__, minor_version);

		return htonl(NFS4ERR_MINOR_VERS_MISMATCH);

	}

	hdr->callback_ident = ntohl(*p++);
@@ -179,7 +179,7 @@ static __be32 decode_getattr_args(struct svc_rqst *rqstp, struct xdr_stream *xdr 
	args->addr = svc_addr(rqstp);

	status = decode_bitmap(xdr, args->bitmap);

out:

	dprintk("%s: exit with status = %d\n", __FUNCTION__, ntohl(status));

	dprintk("%s: exit with status = %d\n", __func__, ntohl(status));

	return status;

}
@@ -200,7 +200,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, 
	args->truncate = ntohl(*p);

	status = decode_fh(xdr, &args->fh);

out:

	dprintk("%s: exit with status = %d\n", __FUNCTION__, ntohl(status));

	dprintk("%s: exit with status = %d\n", __func__, ntohl(status));

	return status;

}
@@ -349,7 +349,7 @@ static __be32 encode_getattr_res(struct svc_rqst *rqstp, struct xdr_stream *xdr, 
	status = encode_attr_mtime(xdr, res->bitmap, &res->mtime);

	*savep = htonl((unsigned int)((char *)xdr->p - (char *)(savep+1)));

out:

	dprintk("%s: exit with status = %d\n", __FUNCTION__, ntohl(status));

	dprintk("%s: exit with status = %d\n", __func__, ntohl(status));

	return status;

}
@@ -363,7 +363,7 @@ static __be32 process_op(struct svc_rqst *rqstp, 
	long maxlen;

	__be32 res;



	dprintk("%s: start\n", __FUNCTION__);

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

	status = decode_op_hdr(xdr_in, &op_nr);

	if (likely(status == 0)) {

		switch (op_nr) {
@@ -392,7 +392,7 @@ static __be32 process_op(struct svc_rqst *rqstp, 
		status = res;

	if (op->encode_res != NULL && status == 0)

		status = op->encode_res(rqstp, xdr_out, resp);

	dprintk("%s: done, status = %d\n", __FUNCTION__, ntohl(status));

	dprintk("%s: done, status = %d\n", __func__, ntohl(status));

	return status;

}
@@ -401,37 +401,37 @@ static __be32 process_op(struct svc_rqst *rqstp, 
 */

static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *resp)

{

	struct cb_compound_hdr_arg hdr_arg;

	struct cb_compound_hdr_res hdr_res;

	struct cb_compound_hdr_arg hdr_arg = { 0 };

	struct cb_compound_hdr_res hdr_res = { NULL };

	struct xdr_stream xdr_in, xdr_out;

	__be32 *p;

	__be32 status;

	unsigned int nops = 1;

	unsigned int nops = 0;



	dprintk("%s: start\n", __FUNCTION__);

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



	xdr_init_decode(&xdr_in, &rqstp->rq_arg, rqstp->rq_arg.head[0].iov_base);



	p = (__be32*)((char *)rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len);

	xdr_init_encode(&xdr_out, &rqstp->rq_res, p);



	decode_compound_hdr_arg(&xdr_in, &hdr_arg);

	status = decode_compound_hdr_arg(&xdr_in, &hdr_arg);

	if (status == __constant_htonl(NFS4ERR_RESOURCE))

		return rpc_garbage_args;



	hdr_res.taglen = hdr_arg.taglen;

	hdr_res.tag = hdr_arg.tag;

	hdr_res.nops = NULL;

	encode_compound_hdr_res(&xdr_out, &hdr_res);

	if (encode_compound_hdr_res(&xdr_out, &hdr_res) != 0)

		return rpc_system_err;



	for (;;) {

	while (status == 0 && nops != hdr_arg.nops) {

		status = process_op(rqstp, &xdr_in, argp, &xdr_out, resp);

		if (status != 0)

			break;

		if (nops == hdr_arg.nops)

			break;

		nops++;

	}



	*hdr_res.status = status;

	*hdr_res.nops = htonl(nops);

	dprintk("%s: done, status = %u\n", __FUNCTION__, ntohl(status));

	dprintk("%s: done, status = %u\n", __func__, ntohl(status));

	return rpc_success;

}

fs/nfs/client.c

+4 −4
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int nfs_create_rpc_client(struct nfs_client *clp, 
	clnt = rpc_create(&args);

	if (IS_ERR(clnt)) {

		dprintk("%s: cannot create RPC client. Error = %ld\n",

				__FUNCTION__, PTR_ERR(clnt));

				__func__, PTR_ERR(clnt));

		return PTR_ERR(clnt);

	}
@@ -576,7 +576,7 @@ static int nfs_init_server_rpcclient(struct nfs_server *server, 


	server->client = rpc_clone_client(clp->cl_rpcclient);

	if (IS_ERR(server->client)) {

		dprintk("%s: couldn't create rpc_client!\n", __FUNCTION__);

		dprintk("%s: couldn't create rpc_client!\n", __func__);

		return PTR_ERR(server->client);

	}
@@ -590,7 +590,7 @@ static int nfs_init_server_rpcclient(struct nfs_server *server, 


		auth = rpcauth_create(pseudoflavour, server->client);

		if (IS_ERR(auth)) {

			dprintk("%s: couldn't create credcache!\n", __FUNCTION__);

			dprintk("%s: couldn't create credcache!\n", __func__);

			return PTR_ERR(auth);

		}

	}
@@ -985,7 +985,7 @@ static int nfs4_init_client(struct nfs_client *clp, 
	error = nfs_idmap_new(clp);

	if (error < 0) {

		dprintk("%s: failed to create idmapper. Error = %d\n",

			__FUNCTION__, error);

			__func__, error);

		goto error;

	}

	__set_bit(NFS_CS_IDMAP, &clp->cl_res_state);

fs/nfs/delegation.c

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_ 
		switch (status) {

			default:

				printk(KERN_ERR "%s: unhandled error %d.\n",

						__FUNCTION__, status);

						__func__, status);

			case -NFS4ERR_EXPIRED:

				/* kill_proc(fl->fl_pid, SIGLOST, 1); */

			case -NFS4ERR_STALE_CLIENTID:
@@ -186,7 +186,7 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct 
		 */

		dfprintk(FILE, "%s: server %s handed out "

				"a duplicate delegation!\n",

				__FUNCTION__, clp->cl_hostname);

				__func__, clp->cl_hostname);

		if (delegation->type <= nfsi->delegation->type) {

			freeme = delegation;

			delegation = NULL;