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

Commit 7111c66e authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] fix svc_procfunc declaration 



svc_procfunc instances return __be32, not int

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarTrond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cc45f017

fs/lockd/svc4proc.c

+20 −20
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ no_locks: 
/*

 * NULL: Test for presence of service

 */

static int

static __be32

nlm4svc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)

{

	dprintk("lockd: NULL          called\n");
@@ -78,7 +78,7 @@ nlm4svc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) 
/*

 * TEST: Check for conflicting lock

 */

static int

static __be32

nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,

				         struct nlm_res  *resp)

{
@@ -107,7 +107,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, 
	return rpc_success;

}



static int

static __be32

nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,

				         struct nlm_res  *resp)

{
@@ -150,7 +150,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, 
	return rpc_success;

}



static int

static __be32

nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,

				           struct nlm_res  *resp)

{
@@ -183,7 +183,7 @@ nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, 
/*

 * UNLOCK: release a lock

 */

static int

static __be32

nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,

				           struct nlm_res  *resp)

{
@@ -217,7 +217,7 @@ nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, 
 * GRANTED: A server calls us to tell that a process' lock request

 * was granted

 */

static int

static __be32

nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

{
@@ -253,12 +253,12 @@ static const struct rpc_call_ops nlm4svc_callback_ops = { 
 * because we send the callback before the reply proper. I hope this

 * doesn't break any clients.

 */

static int nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp,

		int (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res  *))

static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp,

		__be32 (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res  *))

{

	struct nlm_host	*host;

	struct nlm_rqst	*call;

	int stat;

	__be32 stat;



	host = nlmsvc_lookup_host(rqstp,

				  argp->lock.caller,
@@ -282,35 +282,35 @@ static int nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *a 
	return rpc_success;

}



static int nlm4svc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

static __be32 nlm4svc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void	     *resp)

{

	dprintk("lockd: TEST_MSG      called\n");

	return nlm4svc_callback(rqstp, NLMPROC_TEST_RES, argp, nlm4svc_proc_test);

}



static int nlm4svc_proc_lock_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

static __be32 nlm4svc_proc_lock_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void	     *resp)

{

	dprintk("lockd: LOCK_MSG      called\n");

	return nlm4svc_callback(rqstp, NLMPROC_LOCK_RES, argp, nlm4svc_proc_lock);

}



static int nlm4svc_proc_cancel_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

static __be32 nlm4svc_proc_cancel_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					       void	       *resp)

{

	dprintk("lockd: CANCEL_MSG    called\n");

	return nlm4svc_callback(rqstp, NLMPROC_CANCEL_RES, argp, nlm4svc_proc_cancel);

}



static int nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

static __be32 nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

                                               void            *resp)

{

	dprintk("lockd: UNLOCK_MSG    called\n");

	return nlm4svc_callback(rqstp, NLMPROC_UNLOCK_RES, argp, nlm4svc_proc_unlock);

}



static int nlm4svc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

static __be32 nlm4svc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

                                                void            *resp)

{

	dprintk("lockd: GRANTED_MSG   called\n");
@@ -320,7 +320,7 @@ static int nlm4svc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *arg 
/*

 * SHARE: create a DOS share or alter existing share.

 */

static int

static __be32

nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,

				          struct nlm_res  *resp)

{
@@ -353,7 +353,7 @@ nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, 
/*

 * UNSHARE: Release a DOS share.

 */

static int

static __be32

nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

{
@@ -386,7 +386,7 @@ nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, 
/*

 * NM_LOCK: Create an unmonitored lock

 */

static int

static __be32

nlm4svc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

{
@@ -399,7 +399,7 @@ nlm4svc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp, 
/*

 * FREE_ALL: Release all locks and shares held by client

 */

static int

static __be32

nlm4svc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void            *resp)

{
@@ -417,7 +417,7 @@ nlm4svc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, 
/*

 * SM_NOTIFY: private callback from statd (not part of official NLM proto)

 */

static int

static __be32

nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,

					      void	        *resp)

{
@@ -446,7 +446,7 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, 
/*

 * client sent a GRANTED_RES, let's remove the associated block

 */

static int

static __be32

nlm4svc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res  *argp,

                                                void            *resp)

{

fs/lockd/svcproc.c

+20 −20
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ no_locks: 
/*

 * NULL: Test for presence of service

 */

static int

static __be32

nlmsvc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)

{

	dprintk("lockd: NULL          called\n");
@@ -106,7 +106,7 @@ nlmsvc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) 
/*

 * TEST: Check for conflicting lock

 */

static int

static __be32

nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,

				         struct nlm_res  *resp)

{
@@ -136,7 +136,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, 
	return rpc_success;

}



static int

static __be32

nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,

				         struct nlm_res  *resp)

{
@@ -179,7 +179,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, 
	return rpc_success;

}



static int

static __be32

nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,

				           struct nlm_res  *resp)

{
@@ -212,7 +212,7 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, 
/*

 * UNLOCK: release a lock

 */

static int

static __be32

nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,

				           struct nlm_res  *resp)

{
@@ -246,7 +246,7 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, 
 * GRANTED: A server calls us to tell that a process' lock request

 * was granted

 */

static int

static __be32

nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

{
@@ -282,12 +282,12 @@ static const struct rpc_call_ops nlmsvc_callback_ops = { 
 * because we send the callback before the reply proper. I hope this

 * doesn't break any clients.

 */

static int nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp,

		int (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res  *))

static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp,

		__be32 (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res  *))

{

	struct nlm_host	*host;

	struct nlm_rqst	*call;

	int stat;

	__be32 stat;



	host = nlmsvc_lookup_host(rqstp,

				  argp->lock.caller,
@@ -311,28 +311,28 @@ static int nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *ar 
	return rpc_success;

}



static int nlmsvc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

static __be32 nlmsvc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void	     *resp)

{

	dprintk("lockd: TEST_MSG      called\n");

	return nlmsvc_callback(rqstp, NLMPROC_TEST_RES, argp, nlmsvc_proc_test);

}



static int nlmsvc_proc_lock_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

static __be32 nlmsvc_proc_lock_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void	     *resp)

{

	dprintk("lockd: LOCK_MSG      called\n");

	return nlmsvc_callback(rqstp, NLMPROC_LOCK_RES, argp, nlmsvc_proc_lock);

}



static int nlmsvc_proc_cancel_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

static __be32 nlmsvc_proc_cancel_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					       void	       *resp)

{

	dprintk("lockd: CANCEL_MSG    called\n");

	return nlmsvc_callback(rqstp, NLMPROC_CANCEL_RES, argp, nlmsvc_proc_cancel);

}



static int

static __be32

nlmsvc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

                                               void            *resp)

{
@@ -340,7 +340,7 @@ nlmsvc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp, 
	return nlmsvc_callback(rqstp, NLMPROC_UNLOCK_RES, argp, nlmsvc_proc_unlock);

}



static int

static __be32

nlmsvc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

                                                void            *resp)

{
@@ -351,7 +351,7 @@ nlmsvc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp, 
/*

 * SHARE: create a DOS share or alter existing share.

 */

static int

static __be32

nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,

				          struct nlm_res  *resp)

{
@@ -384,7 +384,7 @@ nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, 
/*

 * UNSHARE: Release a DOS share.

 */

static int

static __be32

nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

{
@@ -417,7 +417,7 @@ nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, 
/*

 * NM_LOCK: Create an unmonitored lock

 */

static int

static __be32

nlmsvc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

{
@@ -430,7 +430,7 @@ nlmsvc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp, 
/*

 * FREE_ALL: Release all locks and shares held by client

 */

static int

static __be32

nlmsvc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void            *resp)

{
@@ -448,7 +448,7 @@ nlmsvc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, 
/*

 * SM_NOTIFY: private callback from statd (not part of official NLM proto)

 */

static int

static __be32

nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,

					      void	        *resp)

{
@@ -477,7 +477,7 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, 
/*

 * client sent a GRANTED_RES, let's remove the associated block

 */

static int

static __be32

nlmsvc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res  *argp,

                                                void            *resp)

{

fs/nfs/callback_xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct callback_op { 


static struct callback_op callback_ops[];



static int nfs4_callback_null(struct svc_rqst *rqstp, void *argp, void *resp)

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

{

	return htonl(NFS4_OK);

}
@@ -399,7 +399,7 @@ static unsigned process_op(struct svc_rqst *rqstp, 
/*

 * Decode, process and encode a COMPOUND

 */

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

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;

fs/nfsd/nfs2acl.c

+5 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
/*

 * NULL call.

 */

static int

static __be32

nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)

{

	return nfs_ok;
@@ -30,7 +30,7 @@ nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) 
/*

 * Get the Access and/or Default ACL of a file.

 */

static int nfsacld_proc_getacl(struct svc_rqst * rqstp,

static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp,

		struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)

{

	svc_fh *fh;
@@ -97,7 +97,7 @@ fail: 
/*

 * Set the Access and/or Default ACL of a file.

 */

static int nfsacld_proc_setacl(struct svc_rqst * rqstp,

static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp,

		struct nfsd3_setaclargs *argp,

		struct nfsd_attrstat *resp)

{
@@ -128,7 +128,7 @@ static int nfsacld_proc_setacl(struct svc_rqst * rqstp, 
/*

 * Check file attributes

 */

static int nfsacld_proc_getattr(struct svc_rqst * rqstp,

static __be32 nfsacld_proc_getattr(struct svc_rqst * rqstp,

		struct nfsd_fhandle *argp, struct nfsd_attrstat *resp)

{

	dprintk("nfsd: GETATTR  %s\n", SVCFH_fmt(&argp->fh));
@@ -140,7 +140,7 @@ static int nfsacld_proc_getattr(struct svc_rqst * rqstp, 
/*

 * Check file access

 */

static int nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp,

static __be32 nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp,

		struct nfsd3_accessres *resp)

{

	int nfserr;

fs/nfsd/nfs3acl.c

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
/*

 * NULL call.

 */

static int

static __be32

nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)

{

	return nfs_ok;
@@ -28,7 +28,7 @@ nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) 
/*

 * Get the Access and/or Default ACL of a file.

 */

static int nfsd3_proc_getacl(struct svc_rqst * rqstp,

static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp,

		struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)

{

	svc_fh *fh;
@@ -93,7 +93,7 @@ fail: 
/*

 * Set the Access and/or Default ACL of a file.

 */

static int nfsd3_proc_setacl(struct svc_rqst * rqstp,

static __be32 nfsd3_proc_setacl(struct svc_rqst * rqstp,

		struct nfsd3_setaclargs *argp,

		struct nfsd3_attrstat *resp)

{