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

Commit 3110ff80 authored by Harvey Harrison's avatar Harvey Harrison Committed by Trond Myklebust
Browse files

nfs: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 46c8ac74

fs/nfs/callback.c

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

	if (clp == NULL)

		return SVC_DROP;

		return SVC_DROP;





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

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

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

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

	nfs_put_client(clp);

	nfs_put_client(clp);

fs/nfs/callback_proc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ __be32 nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres * 
out_putclient:

out_putclient:

	nfs_put_client(clp);

	nfs_put_client(clp);

out:

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;

	return res->status;

}

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

		nfs_put_client(prev);

	} while (clp != NULL);

	} while (clp != NULL);

out:

out:

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

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

	return res;

	return res;

}
 
}

fs/nfs/callback_xdr.c

+9 −9
Original line number Original line 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! */

	/* We do not like overly long tags! */

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

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

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

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

				__FUNCTION__, hdr->taglen);

				__func__, hdr->taglen);

		return htonl(NFS4ERR_RESOURCE);

		return htonl(NFS4ERR_RESOURCE);

	}

	}

	p = read_buf(xdr, 12);

	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. */

	/* Check minor version is zero. */

	if (minor_version != 0) {

	if (minor_version != 0) {

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

		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);

		return htonl(NFS4ERR_MINOR_VERS_MISMATCH);

	}

	}

	hdr->callback_ident = ntohl(*p++);

	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);

	args->addr = svc_addr(rqstp);

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

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

out:

out:

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

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

	return status;

	return status;

}

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

	args->truncate = ntohl(*p);

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

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

out:

out:

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

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

	return 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);

	status = encode_attr_mtime(xdr, res->bitmap, &res->mtime);

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

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

out:

out:

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

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

	return status;

	return status;

}

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

	long maxlen;

	__be32 res;

	__be32 res;





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

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

	status = decode_op_hdr(xdr_in, &op_nr);

	status = decode_op_hdr(xdr_in, &op_nr);

	if (likely(status == 0)) {

	if (likely(status == 0)) {

		switch (op_nr) {

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

		status = res;

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

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

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

		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;

	return status;

}

}
@@ -408,7 +408,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r 
	__be32 status;

	__be32 status;

	unsigned int nops = 0;

	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);

	xdr_init_decode(&xdr_in, &rqstp->rq_arg, rqstp->rq_arg.head[0].iov_base);
@@ -431,7 +431,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r 




	*hdr_res.status = status;

	*hdr_res.status = status;

	*hdr_res.nops = htonl(nops);

	*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;

	return rpc_success;

}

}

fs/nfs/client.c

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

	clnt = rpc_create(&args);

	if (IS_ERR(clnt)) {

	if (IS_ERR(clnt)) {

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

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

				__FUNCTION__, PTR_ERR(clnt));

				__func__, PTR_ERR(clnt));

		return 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);

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

	if (IS_ERR(server->client)) {

	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);

		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);

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

		if (IS_ERR(auth)) {

		if (IS_ERR(auth)) {

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

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

			return PTR_ERR(auth);

			return PTR_ERR(auth);

		}

		}

	}

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

	error = nfs_idmap_new(clp);

	if (error < 0) {

	if (error < 0) {

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

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

			__FUNCTION__, error);

			__func__, error);

		goto error;

		goto error;

	}

	}

	__set_bit(NFS_CS_IDMAP, &clp->cl_res_state);

	__set_bit(NFS_CS_IDMAP, &clp->cl_res_state);

fs/nfs/delegation.c

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

		switch (status) {

			default:

			default:

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

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

						__FUNCTION__, status);

						__func__, status);

			case -NFS4ERR_EXPIRED:

			case -NFS4ERR_EXPIRED:

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

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

			case -NFS4ERR_STALE_CLIENTID:

			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 "

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

				"a duplicate delegation!\n",

				"a duplicate delegation!\n",

				__FUNCTION__, clp->cl_hostname);

				__func__, clp->cl_hostname);

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

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

			freeme = delegation;

			freeme = delegation;

			delegation = NULL;

			delegation = NULL;