Commit 19207231 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Clean up in-kernel NFS mount 



Clean up white space and coding conventions.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 3ea97309

fs/nfs/mount_clnt.c

+37 −46
Original line number Diff line number Diff line 
/*

 * linux/fs/nfs/mount_clnt.c

 *

 * MOUNT client to support NFSroot.

 * In-kernel MOUNT protocol client

 *

 * Copyright (C) 1997, Olaf Kirch <okir@monad.swb.de>

 */
@@ -21,17 +19,10 @@ 
# define NFSDBG_FACILITY	NFSDBG_MOUNT

#endif



/*

#define MOUNT_PROGRAM		100005

#define MOUNT_VERSION		1

#define MOUNT_MNT		1

#define MOUNT_UMNT		3

 */



static struct rpc_program	mnt_program;



struct mnt_fhstatus {

	unsigned int		status;

	u32 status;

	struct nfs_fh *fh;

};
@@ -90,8 +81,8 @@ int nfs_mount(struct sockaddr *addr, size_t len, char *hostname, char *path, 
/*

 * XDR encode/decode functions for MOUNT

 */

static int

xdr_encode_dirpath(struct rpc_rqst *req, __be32 *p, const char *path)

static int xdr_encode_dirpath(struct rpc_rqst *req, __be32 *p,

			      const char *path)

{

	p = xdr_encode_string(p, path);
@@ -99,8 +90,8 @@ xdr_encode_dirpath(struct rpc_rqst *req, __be32 *p, const char *path) 
	return 0;

}



static int

xdr_decode_fhstatus(struct rpc_rqst *req, __be32 *p, struct mnt_fhstatus *res)

static int xdr_decode_fhstatus(struct rpc_rqst *req, __be32 *p,

			       struct mnt_fhstatus *res)

{

	struct nfs_fh *fh = res->fh;
@@ -111,8 +102,8 @@ xdr_decode_fhstatus(struct rpc_rqst *req, __be32 *p, struct mnt_fhstatus *res) 
	return 0;

}



static int

xdr_decode_fhstatus3(struct rpc_rqst *req, __be32 *p, struct mnt_fhstatus *res)

static int xdr_decode_fhstatus3(struct rpc_rqst *req, __be32 *p,

				struct mnt_fhstatus *res)

{

	struct nfs_fh *fh = res->fh;
@@ -159,13 +150,13 @@ static struct rpc_procinfo mnt3_procedures[] = { 
static struct rpc_version mnt_version1 = {

	.number		= 1,

	.nrprocs	= 2,

		.procs 		= mnt_procedures

	.procs		= mnt_procedures,

};



static struct rpc_version mnt_version3 = {

	.number		= 3,

	.nrprocs	= 2,

		.procs		= mnt3_procedures

	.procs		= mnt3_procedures,

};



static struct rpc_version *mnt_version[] = {