evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFS: Clean up in-kernel NFS mount

Browse source 
Clean up white space and coding conventions.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever 2007-07-01 12:13:33 -04:00 • committed by Trond Myklebust
parent 3ea97309e6
commit 19207231c9
1 changed files with 37 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
fs/nfs/mount_clnt.c
View file

@ -1,7 +1,5 @@
/* /*
* linux/fs/nfs/mount_clnt.c * In-kernel MOUNT protocol client
*
* MOUNT client to support NFSroot.
* *
* Copyright (C) 1997, Olaf Kirch <okir@monad.swb.de> * Copyright (C) 1997, Olaf Kirch <okir@monad.swb.de>
*/ */
@ -21,18 +19,11 @@
# define NFSDBG_FACILITY NFSDBG_MOUNT # define NFSDBG_FACILITY NFSDBG_MOUNT
#endif #endif
/*
#define MOUNT_PROGRAM 100005
#define MOUNT_VERSION 1
#define MOUNT_MNT 1
#define MOUNT_UMNT 3
*/
static struct rpc_program mnt_program; static struct rpc_program mnt_program;
struct mnt_fhstatus { struct mnt_fhstatus {
unsigned int status; u32 status;
struct nfs_fh * fh; 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 * XDR encode/decode functions for MOUNT
*/ */
static int static int xdr_encode_dirpath(struct rpc_rqst *req, __be32 *p,
xdr_encode_dirpath(struct rpc_rqst *req, __be32 *p, const char *path) const char *path)
{ {
p = xdr_encode_string(p, 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; return 0;
} }
static int static int xdr_decode_fhstatus(struct rpc_rqst *req, __be32 *p,
xdr_decode_fhstatus(struct rpc_rqst *req, __be32 *p, struct mnt_fhstatus *res) struct mnt_fhstatus *res)
{ {
struct nfs_fh *fh = res->fh; 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; return 0;
} }
static int static int xdr_decode_fhstatus3(struct rpc_rqst *req, __be32 *p,
xdr_decode_fhstatus3(struct rpc_rqst *req, __be32 *p, struct mnt_fhstatus *res) struct mnt_fhstatus *res)
{ {
struct nfs_fh *fh = res->fh; struct nfs_fh *fh = res->fh;
@ -132,7 +123,7 @@ xdr_decode_fhstatus3(struct rpc_rqst *req, __be32 *p, struct mnt_fhstatus *res)
#define MNT_fhstatus3_sz (1 + 16) #define MNT_fhstatus3_sz (1 + 16)
static struct rpc_procinfo mnt_procedures[] = { static struct rpc_procinfo mnt_procedures[] = {
[MNTPROC_MNT] = { [MNTPROC_MNT] = {
.p_proc = MNTPROC_MNT, .p_proc = MNTPROC_MNT,
.p_encode = (kxdrproc_t) xdr_encode_dirpath, .p_encode = (kxdrproc_t) xdr_encode_dirpath,
.p_decode = (kxdrproc_t) xdr_decode_fhstatus, .p_decode = (kxdrproc_t) xdr_decode_fhstatus,
@ -144,7 +135,7 @@ static struct rpc_procinfo mnt_procedures[] = {
}; };
static struct rpc_procinfo mnt3_procedures[] = { static struct rpc_procinfo mnt3_procedures[] = {
[MOUNTPROC3_MNT] = { [MOUNTPROC3_MNT] = {
.p_proc = MOUNTPROC3_MNT, .p_proc = MOUNTPROC3_MNT,
.p_encode = (kxdrproc_t) xdr_encode_dirpath, .p_encode = (kxdrproc_t) xdr_encode_dirpath,
.p_decode = (kxdrproc_t) xdr_decode_fhstatus3, .p_decode = (kxdrproc_t) xdr_decode_fhstatus3,
@ -159,16 +150,16 @@ static struct rpc_procinfo mnt3_procedures[] = {
static struct rpc_version mnt_version1 = { static struct rpc_version mnt_version1 = {
.number = 1, .number = 1,
.nrprocs = 2, .nrprocs = 2,
.procs = mnt_procedures .procs = mnt_procedures,
}; };
static struct rpc_version mnt_version3 = { static struct rpc_version mnt_version3 = {
.number = 3, .number = 3,
.nrprocs = 2, .nrprocs = 2,
.procs = mnt3_procedures .procs = mnt3_procedures,
}; };
static struct rpc_version * mnt_version[] = { static struct rpc_version *mnt_version[] = {
NULL, NULL,
&mnt_version1, &mnt_version1,
NULL, NULL,