NLM/NFS: Use cached nlm_host when calling nlmclnt_proc()

[safe/jmp/linux-2.6] / fs / nfs / mount_clnt.c

diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c
index ee4899d..8afd9f7 100644 (file)
--- a/fs/nfs/mount_clnt.c
+++ b/fs/nfs/mount_clnt.c
@@ -1,7 +1,5 @@
 /*
- * 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,18 +19,11 @@
 # 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;
-       struct nfs_fh *         fh;
+       u32 status;
+       struct nfs_fh *fh;
 };
 
 /**
@@ -75,7 +66,7 @@ int nfs_mount(struct sockaddr *addr, size_t len, char *hostname, char *path,
 
        mnt_clnt = rpc_create(&args);
        if (IS_ERR(mnt_clnt))
-               return PTR_ERR(mnt_clnt);
+               goto out_clnt_err;
 
        if (version == NFS_MNT3_VERSION)
                msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC3_MNT];
@@ -84,14 +75,38 @@ int nfs_mount(struct sockaddr *addr, size_t len, char *hostname, char *path,
 
        status = rpc_call_sync(mnt_clnt, &msg, 0);
        rpc_shutdown_client(mnt_clnt);
-       return status < 0? status : (result.status? -EACCES : 0);
+
+       if (status < 0)
+               goto out_call_err;
+       if (result.status != 0)
+               goto out_mnt_err;
+
+       dprintk("NFS: MNT request succeeded\n");
+       status = 0;
+
+out:
+       return status;
+
+out_clnt_err:
+       status = PTR_ERR(mnt_clnt);
+       dprintk("NFS: failed to create RPC client, status=%d\n", status);
+       goto out;
+
+out_call_err:
+       dprintk("NFS: failed to start MNT request, status=%d\n", status);
+       goto out;
+
+out_mnt_err:
+       dprintk("NFS: MNT server returned result %d\n", result.status);
+       status = -EACCES;
+       goto out;
 }
 
 /*
  * 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 +114,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 +126,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;
 
@@ -131,53 +146,53 @@ xdr_decode_fhstatus3(struct rpc_rqst *req, __be32 *p, struct mnt_fhstatus *res)
 #define MNT_fhstatus_sz                (1 + 8)
 #define MNT_fhstatus3_sz       (1 + 16)
 
-static struct rpc_procinfo     mnt_procedures[] = {
-[MNTPROC_MNT] = {
-         .p_proc               = MNTPROC_MNT,
-         .p_encode             = (kxdrproc_t) xdr_encode_dirpath,      
-         .p_decode             = (kxdrproc_t) xdr_decode_fhstatus,
-         .p_arglen             = MNT_dirpath_sz,
-         .p_replen             = MNT_fhstatus_sz,
-         .p_statidx            = MNTPROC_MNT,
-         .p_name               = "MOUNT",
+static struct rpc_procinfo mnt_procedures[] = {
+       [MNTPROC_MNT] = {
+               .p_proc         = MNTPROC_MNT,
+               .p_encode       = (kxdrproc_t) xdr_encode_dirpath,
+               .p_decode       = (kxdrproc_t) xdr_decode_fhstatus,
+               .p_arglen       = MNT_dirpath_sz,
+               .p_replen       = MNT_fhstatus_sz,
+               .p_statidx      = MNTPROC_MNT,
+               .p_name         = "MOUNT",
        },
 };
 
 static struct rpc_procinfo mnt3_procedures[] = {
-[MOUNTPROC3_MNT] = {
-         .p_proc               = MOUNTPROC3_MNT,
-         .p_encode             = (kxdrproc_t) xdr_encode_dirpath,
-         .p_decode             = (kxdrproc_t) xdr_decode_fhstatus3,
-         .p_arglen             = MNT_dirpath_sz,
-         .p_replen             = MNT_fhstatus3_sz,
-         .p_statidx            = MOUNTPROC3_MNT,
-         .p_name               = "MOUNT",
+       [MOUNTPROC3_MNT] = {
+               .p_proc         = MOUNTPROC3_MNT,
+               .p_encode       = (kxdrproc_t) xdr_encode_dirpath,
+               .p_decode       = (kxdrproc_t) xdr_decode_fhstatus3,
+               .p_arglen       = MNT_dirpath_sz,
+               .p_replen       = MNT_fhstatus3_sz,
+               .p_statidx      = MOUNTPROC3_MNT,
+               .p_name         = "MOUNT",
        },
 };
 
 
-static struct rpc_version      mnt_version1 = {
-               .number         = 1,
-               .nrprocs        = 2,
-               .procs          = mnt_procedures
+static struct rpc_version mnt_version1 = {
+       .number         = 1,
+       .nrprocs        = 2,
+       .procs          = mnt_procedures,
 };
 
-static struct rpc_version       mnt_version3 = {
-               .number         = 3,
-               .nrprocs        = 2,
-               .procs          = mnt3_procedures
+static struct rpc_version mnt_version3 = {
+       .number         = 3,
+       .nrprocs        = 2,
+       .procs          = mnt3_procedures,
 };
 
-static struct rpc_version *    mnt_version[] = {
+static struct rpc_version *mnt_version[] = {
        NULL,
        &mnt_version1,
        NULL,
        &mnt_version3,
 };
 
-static struct rpc_stat         mnt_stats;
+static struct rpc_stat mnt_stats;
 
-static struct rpc_program      mnt_program = {
+static struct rpc_program mnt_program = {
        .name           = "mount",
        .number         = NFS_MNT_PROGRAM,
        .nrvers         = ARRAY_SIZE(mnt_version),