Skip to content

Commit

Permalink
9p: client code cleanup
Browse files Browse the repository at this point in the history
Make p9_client_version static since only used in one file.
Remove p9_client_auth because it is defined but never used.
Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
stephen hemminger authored and David S. Miller committed Oct 21, 2010
1 parent ff51bf8 commit 32a875a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 53 deletions.
3 changes: 0 additions & 3 deletions include/net/9p/client.h
Original file line number Diff line number Diff line change
Expand Up @@ -212,15 +212,12 @@ struct p9_dirent {

int p9_client_statfs(struct p9_fid *fid, struct p9_rstatfs *sb);
int p9_client_rename(struct p9_fid *fid, struct p9_fid *newdirfid, char *name);
int p9_client_version(struct p9_client *);
struct p9_client *p9_client_create(const char *dev_name, char *options);
void p9_client_destroy(struct p9_client *clnt);
void p9_client_disconnect(struct p9_client *clnt);
void p9_client_begin_disconnect(struct p9_client *clnt);
struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,
char *uname, u32 n_uname, char *aname);
struct p9_fid *p9_client_auth(struct p9_client *clnt, char *uname,
u32 n_uname, char *aname);
struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames,
int clone);
int p9_client_open(struct p9_fid *fid, int mode);
Expand Down
51 changes: 1 addition & 50 deletions net/9p/client.c
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ static void p9_fid_destroy(struct p9_fid *fid)
kfree(fid);
}

int p9_client_version(struct p9_client *c)
static int p9_client_version(struct p9_client *c)
{
int err = 0;
struct p9_req_t *req;
Expand Down Expand Up @@ -730,7 +730,6 @@ int p9_client_version(struct p9_client *c)

return err;
}
EXPORT_SYMBOL(p9_client_version);

struct p9_client *p9_client_create(const char *dev_name, char *options)
{
Expand Down Expand Up @@ -887,54 +886,6 @@ struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,
}
EXPORT_SYMBOL(p9_client_attach);

struct p9_fid *
p9_client_auth(struct p9_client *clnt, char *uname, u32 n_uname, char *aname)
{
int err;
struct p9_req_t *req;
struct p9_qid qid;
struct p9_fid *afid;

P9_DPRINTK(P9_DEBUG_9P, ">>> TAUTH uname %s aname %s\n", uname, aname);
err = 0;

afid = p9_fid_create(clnt);
if (IS_ERR(afid)) {
err = PTR_ERR(afid);
afid = NULL;
goto error;
}

req = p9_client_rpc(clnt, P9_TAUTH, "dss?d",
afid ? afid->fid : P9_NOFID, uname, aname, n_uname);
if (IS_ERR(req)) {
err = PTR_ERR(req);
goto error;
}

err = p9pdu_readf(req->rc, clnt->proto_version, "Q", &qid);
if (err) {
p9pdu_dump(1, req->rc);
p9_free_req(clnt, req);
goto error;
}

P9_DPRINTK(P9_DEBUG_9P, "<<< RAUTH qid %x.%llx.%x\n",
qid.type,
(unsigned long long)qid.path,
qid.version);

memmove(&afid->qid, &qid, sizeof(struct p9_qid));
p9_free_req(clnt, req);
return afid;

error:
if (afid)
p9_fid_destroy(afid);
return ERR_PTR(err);
}
EXPORT_SYMBOL(p9_client_auth);

struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames,
int clone)
{
Expand Down

0 comments on commit 32a875a

Please sign in to comment.