Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 118543
b: refs/heads/master
c: b22cecd
h: refs/heads/master
i:
  118541: 3d5f877
  118539: ef85339
  118535: 350bf42
  118527: 99e8964
v: v3
  • Loading branch information
Randy Dunlap authored and David S. Miller committed Nov 5, 2008
1 parent 2b13e8c commit deaaab1
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b22ea560957de1484e6b3e8538f7eef202e3596
refs/heads/master: b22cecdd8fa4667ebab02def0866387e709927ee
31 changes: 20 additions & 11 deletions trunk/net/9p/client.c
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,9 @@ struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,
}

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

memmove(&fid->qid, &qid, sizeof(struct p9_qid));

Expand Down Expand Up @@ -865,7 +867,9 @@ p9_client_auth(struct p9_client *clnt, char *uname, u32 n_uname, char *aname)
}

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

memmove(&afid->qid, &qid, sizeof(struct p9_qid));
p9_free_req(clnt, req);
Expand Down Expand Up @@ -930,7 +934,8 @@ struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames,

for (count = 0; count < nwqids; count++)
P9_DPRINTK(P9_DEBUG_9P, "<<< [%d] %x.%llx.%x\n",
count, wqids[count].type, wqids[count].path,
count, wqids[count].type,
(unsigned long long)wqids[count].path,
wqids[count].version);

if (nwname)
Expand Down Expand Up @@ -980,7 +985,9 @@ int p9_client_open(struct p9_fid *fid, int mode)
}

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

fid->mode = mode;
fid->iounit = iounit;
Expand Down Expand Up @@ -1023,7 +1030,9 @@ int p9_client_fcreate(struct p9_fid *fid, char *name, u32 perm, int mode,
}

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

fid->mode = mode;
fid->iounit = iounit;
Expand Down Expand Up @@ -1230,9 +1239,9 @@ struct p9_wstat *p9_client_stat(struct p9_fid *fid)
"<<< name=%s uid=%s gid=%s muid=%s extension=(%s)\n"
"<<< uid=%d gid=%d n_muid=%d\n",
ret->size, ret->type, ret->dev, ret->qid.type,
ret->qid.path, ret->qid.version, ret->mode,
ret->atime, ret->mtime, ret->length, ret->name,
ret->uid, ret->gid, ret->muid, ret->extension,
(unsigned long long)ret->qid.path, ret->qid.version, ret->mode,
ret->atime, ret->mtime, (unsigned long long)ret->length,
ret->name, ret->uid, ret->gid, ret->muid, ret->extension,
ret->n_uid, ret->n_gid, ret->n_muid);

free_and_error:
Expand All @@ -1255,9 +1264,9 @@ int p9_client_wstat(struct p9_fid *fid, struct p9_wstat *wst)
" name=%s uid=%s gid=%s muid=%s extension=(%s)\n"
" uid=%d gid=%d n_muid=%d\n",
wst->size, wst->type, wst->dev, wst->qid.type,
wst->qid.path, wst->qid.version, wst->mode,
wst->atime, wst->mtime, wst->length, wst->name,
wst->uid, wst->gid, wst->muid, wst->extension,
(unsigned long long)wst->qid.path, wst->qid.version, wst->mode,
wst->atime, wst->mtime, (unsigned long long)wst->length,
wst->name, wst->uid, wst->gid, wst->muid, wst->extension,
wst->n_uid, wst->n_gid, wst->n_muid);
err = 0;
clnt = fid->clnt;
Expand Down

0 comments on commit deaaab1

Please sign in to comment.