[PATCH] knfsd: nfsd4: fix non-terminated string

[sfrench/cifs-2.6.git] / fs / nfsd / nfs4callback.c

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index f57655a7a2b66b9ae1b1567e9d5500b581a5c9ae..fb14d68eacab846db08f92bbcdca7a1aff56e43c 100644 (file)
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -387,7 +387,6 @@ nfsd4_probe_callback(struct nfs4_client *clp)
                .address        = (struct sockaddr *)&addr,
                .addrsize       = sizeof(addr),
                .timeout        = &timeparms,
-               .servername     = clp->cl_name.data,
                .program        = program,
                .version        = nfs_cb_version[1]->number,
                .authflavor     = RPC_AUTH_UNIX,        /* XXX: need AUTH_GSS... */
@@ -397,6 +396,7 @@ nfsd4_probe_callback(struct nfs4_client *clp)
                .rpc_proc       = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL],
                .rpc_argp       = clp,
        };
+       char clientname[16];
        int status;
 
        if (atomic_read(&cb->cb_set))
@@ -419,6 +419,11 @@ nfsd4_probe_callback(struct nfs4_client *clp)
        memset(program->stats, 0, sizeof(cb->cb_stat));
        program->stats->program = program;
 
+       /* Just here to make some printk's more useful: */
+       snprintf(clientname, sizeof(clientname),
+               "%u.%u.%u.%u", NIPQUAD(addr.sin_addr));
+       args.servername = clientname;
+
        /* Create RPC client */
        cb->cb_client = rpc_create(&args);
        if (IS_ERR(cb->cb_client)) {