diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
| commit | 818fa7f3908c7bd6c0045e9d94dc23a899ef6144 (patch) | |
| tree | ad3435c3f57c8222ad61709b716168932f13be6c /fs/nfsd/nfs4callback.c | |
| parent | 3fd4bc015ef879a7d2b955ce97fb125e3a51ba7e (diff) | |
| parent | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (diff) | |
| download | op-kernel-dev-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.zip op-kernel-dev-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.tar.gz | |
Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
Diffstat (limited to 'fs/nfsd/nfs4callback.c')
| -rw-r--r-- | fs/nfsd/nfs4callback.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 094747a..6d7d8c0 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -358,6 +358,7 @@ static struct rpc_program cb_program = { .nrvers = ARRAY_SIZE(nfs_cb_version), .version = nfs_cb_version, .stats = &cb_stats, + .pipe_dir_name = "/nfsd4_cb", }; /* Reference counting, callback cleanup, etc., all look racy as heck. @@ -382,8 +383,9 @@ static int do_probe_callback(void *data) .program = &cb_program, .prognumber = cb->cb_prog, .version = nfs_cb_version[1]->number, - .authflavor = RPC_AUTH_UNIX, /* XXX: need AUTH_GSS... */ + .authflavor = clp->cl_flavor, .flags = (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET), + .client_name = clp->cl_principal, }; struct rpc_message msg = { .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL], @@ -392,6 +394,11 @@ static int do_probe_callback(void *data) struct rpc_clnt *client; int status; + if (!clp->cl_principal && (clp->cl_flavor >= RPC_AUTH_GSS_KRB5)) { + status = nfserr_cb_path_down; + goto out_err; + } + /* Initialize address */ memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; |
