2007-07-11 00:57:28 +02:00
|
|
|
/*
|
|
|
|
* net/9p/clnt.c
|
|
|
|
*
|
|
|
|
* 9P Client
|
|
|
|
*
|
2008-02-07 02:25:03 +01:00
|
|
|
* Copyright (C) 2008 by Eric Van Hensbergen <ericvh@gmail.com>
|
2007-07-11 00:57:28 +02:00
|
|
|
* Copyright (C) 2007 by Latchesar Ionkov <lucho@ionkov.net>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2
|
|
|
|
* as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to:
|
|
|
|
* Free Software Foundation
|
|
|
|
* 51 Franklin Street, Fifth Floor
|
|
|
|
* Boston, MA 02111-1301 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/fs.h>
|
2008-02-07 02:25:03 +01:00
|
|
|
#include <linux/poll.h>
|
2007-07-11 00:57:28 +02:00
|
|
|
#include <linux/idr.h>
|
|
|
|
#include <linux/mutex.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 09:04:11 +01:00
|
|
|
#include <linux/slab.h>
|
2007-07-11 00:57:28 +02:00
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/uaccess.h>
|
|
|
|
#include <net/9p/9p.h>
|
2007-10-17 21:31:07 +02:00
|
|
|
#include <linux/parser.h>
|
2007-07-11 00:57:28 +02:00
|
|
|
#include <net/9p/client.h>
|
2008-10-14 01:45:25 +02:00
|
|
|
#include <net/9p/transport.h>
|
2008-10-16 15:30:07 +02:00
|
|
|
#include "protocol.h"
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-02-07 02:25:03 +01:00
|
|
|
/*
|
|
|
|
* Client Option Parsing (code inspired by NFS code)
|
|
|
|
* - a little lazy - parse all client options
|
|
|
|
*/
|
|
|
|
|
|
|
|
enum {
|
|
|
|
Opt_msize,
|
|
|
|
Opt_trans,
|
|
|
|
Opt_legacy,
|
2010-03-05 19:49:11 +01:00
|
|
|
Opt_version,
|
2008-02-07 02:25:03 +01:00
|
|
|
Opt_err,
|
|
|
|
};
|
|
|
|
|
2008-10-13 11:46:57 +02:00
|
|
|
static const match_table_t tokens = {
|
2008-02-07 02:25:03 +01:00
|
|
|
{Opt_msize, "msize=%u"},
|
|
|
|
{Opt_legacy, "noextend"},
|
|
|
|
{Opt_trans, "trans=%s"},
|
2010-03-05 19:49:11 +01:00
|
|
|
{Opt_version, "version=%s"},
|
2008-02-07 02:25:03 +01:00
|
|
|
{Opt_err, NULL},
|
|
|
|
};
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
inline int p9_is_proto_dotl(struct p9_client *clnt)
|
|
|
|
{
|
2010-03-08 18:33:04 +01:00
|
|
|
return (clnt->proto_version == p9_proto_2000L);
|
2010-03-05 19:50:14 +01:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_is_proto_dotl);
|
|
|
|
|
|
|
|
inline int p9_is_proto_dotu(struct p9_client *clnt)
|
|
|
|
{
|
|
|
|
return (clnt->proto_version == p9_proto_2000u);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_is_proto_dotu);
|
|
|
|
|
2010-03-05 19:49:11 +01:00
|
|
|
/* Interpret mount option for protocol version */
|
2010-04-05 21:37:28 +02:00
|
|
|
static int get_protocol_version(const substring_t *name)
|
2010-03-05 19:49:11 +01:00
|
|
|
{
|
2010-04-05 21:37:28 +02:00
|
|
|
int version = -EINVAL;
|
|
|
|
|
2010-03-05 19:49:11 +01:00
|
|
|
if (!strncmp("9p2000", name->from, name->to-name->from)) {
|
|
|
|
version = p9_proto_legacy;
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "Protocol version: Legacy\n");
|
|
|
|
} else if (!strncmp("9p2000.u", name->from, name->to-name->from)) {
|
|
|
|
version = p9_proto_2000u;
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "Protocol version: 9P2000.u\n");
|
2010-03-08 18:33:04 +01:00
|
|
|
} else if (!strncmp("9p2000.L", name->from, name->to-name->from)) {
|
|
|
|
version = p9_proto_2000L;
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "Protocol version: 9P2000.L\n");
|
2010-03-05 19:49:11 +01:00
|
|
|
} else {
|
|
|
|
P9_DPRINTK(P9_DEBUG_ERROR, "Unknown protocol version %s. ",
|
|
|
|
name->from);
|
|
|
|
}
|
|
|
|
return version;
|
|
|
|
}
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
static struct p9_req_t *
|
|
|
|
p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...);
|
2008-10-14 01:45:21 +02:00
|
|
|
|
2008-02-07 02:25:03 +01:00
|
|
|
/**
|
2009-07-19 21:41:55 +02:00
|
|
|
* parse_options - parse mount options into client structure
|
|
|
|
* @opts: options string passed from mount
|
|
|
|
* @clnt: existing v9fs client information
|
2008-02-07 02:25:03 +01:00
|
|
|
*
|
2008-03-07 17:53:53 +01:00
|
|
|
* Return 0 upon success, -ERRNO upon failure
|
2008-02-07 02:25:03 +01:00
|
|
|
*/
|
|
|
|
|
2008-03-07 17:53:53 +01:00
|
|
|
static int parse_opts(char *opts, struct p9_client *clnt)
|
2008-02-07 02:25:03 +01:00
|
|
|
{
|
2010-02-08 23:23:23 +01:00
|
|
|
char *options, *tmp_options;
|
2008-02-07 02:25:03 +01:00
|
|
|
char *p;
|
|
|
|
substring_t args[MAX_OPT_ARGS];
|
|
|
|
int option;
|
2008-03-07 17:53:53 +01:00
|
|
|
int ret = 0;
|
2008-02-07 02:25:03 +01:00
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
clnt->proto_version = p9_proto_2000u;
|
2008-02-07 02:25:03 +01:00
|
|
|
clnt->msize = 8192;
|
|
|
|
|
2008-03-07 17:53:53 +01:00
|
|
|
if (!opts)
|
|
|
|
return 0;
|
|
|
|
|
2010-02-08 23:23:23 +01:00
|
|
|
tmp_options = kstrdup(opts, GFP_KERNEL);
|
|
|
|
if (!tmp_options) {
|
2008-03-07 17:53:53 +01:00
|
|
|
P9_DPRINTK(P9_DEBUG_ERROR,
|
|
|
|
"failed to allocate copy of option string\n");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2010-02-08 23:23:23 +01:00
|
|
|
options = tmp_options;
|
2008-02-07 02:25:03 +01:00
|
|
|
|
|
|
|
while ((p = strsep(&options, ",")) != NULL) {
|
|
|
|
int token;
|
|
|
|
if (!*p)
|
|
|
|
continue;
|
|
|
|
token = match_token(p, tokens, args);
|
|
|
|
if (token < Opt_trans) {
|
2008-03-07 17:53:53 +01:00
|
|
|
int r = match_int(&args[0], &option);
|
|
|
|
if (r < 0) {
|
2008-02-07 02:25:03 +01:00
|
|
|
P9_DPRINTK(P9_DEBUG_ERROR,
|
|
|
|
"integer field, but no integer?\n");
|
2008-03-07 17:53:53 +01:00
|
|
|
ret = r;
|
2008-02-07 02:25:03 +01:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
switch (token) {
|
|
|
|
case Opt_msize:
|
|
|
|
clnt->msize = option;
|
|
|
|
break;
|
|
|
|
case Opt_trans:
|
2008-09-24 23:22:23 +02:00
|
|
|
clnt->trans_mod = v9fs_get_trans_by_name(&args[0]);
|
2010-01-16 02:01:10 +01:00
|
|
|
if(clnt->trans_mod == NULL) {
|
|
|
|
P9_DPRINTK(P9_DEBUG_ERROR,
|
|
|
|
"Could not find request transport: %s\n",
|
|
|
|
(char *) &args[0]);
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto free_and_return;
|
|
|
|
}
|
2008-02-07 02:25:03 +01:00
|
|
|
break;
|
|
|
|
case Opt_legacy:
|
2010-03-05 19:50:14 +01:00
|
|
|
clnt->proto_version = p9_proto_legacy;
|
2008-02-07 02:25:03 +01:00
|
|
|
break;
|
2010-03-05 19:49:11 +01:00
|
|
|
case Opt_version:
|
|
|
|
ret = get_protocol_version(&args[0]);
|
|
|
|
if (ret == -EINVAL)
|
|
|
|
goto free_and_return;
|
|
|
|
clnt->proto_version = ret;
|
|
|
|
break;
|
2008-02-07 02:25:03 +01:00
|
|
|
default:
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2008-09-24 23:22:23 +02:00
|
|
|
|
2010-01-16 02:01:10 +01:00
|
|
|
free_and_return:
|
2010-02-08 23:23:23 +01:00
|
|
|
kfree(tmp_options);
|
2008-03-07 17:53:53 +01:00
|
|
|
return ret;
|
2008-02-07 02:25:03 +01:00
|
|
|
}
|
|
|
|
|
2008-10-14 01:45:23 +02:00
|
|
|
/**
|
|
|
|
* p9_tag_alloc - lookup/allocate a request by tag
|
|
|
|
* @c: client session to lookup tag within
|
|
|
|
* @tag: numeric id for transaction
|
|
|
|
*
|
|
|
|
* this is a simple array lookup, but will grow the
|
|
|
|
* request_slots as necessary to accomodate transaction
|
|
|
|
* ids which did not previously have a slot.
|
|
|
|
*
|
|
|
|
* this code relies on the client spinlock to manage locks, its
|
|
|
|
* possible we should switch to something else, but I'd rather
|
|
|
|
* stick with something low-overhead for the common case.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
static struct p9_req_t *p9_tag_alloc(struct p9_client *c, u16 tag)
|
2008-10-14 01:45:23 +02:00
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
int row, col;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_req_t *req;
|
2008-10-14 01:45:23 +02:00
|
|
|
|
|
|
|
/* This looks up the original request by tag so we know which
|
|
|
|
* buffer to read the data into */
|
|
|
|
tag++;
|
|
|
|
|
|
|
|
if (tag >= c->max_tag) {
|
|
|
|
spin_lock_irqsave(&c->lock, flags);
|
|
|
|
/* check again since original check was outside of lock */
|
|
|
|
while (tag >= c->max_tag) {
|
|
|
|
row = (tag / P9_ROW_MAXTAG);
|
|
|
|
c->reqs[row] = kcalloc(P9_ROW_MAXTAG,
|
|
|
|
sizeof(struct p9_req_t), GFP_ATOMIC);
|
|
|
|
|
|
|
|
if (!c->reqs[row]) {
|
|
|
|
printk(KERN_ERR "Couldn't grow tag array\n");
|
2008-10-23 01:54:47 +02:00
|
|
|
spin_unlock_irqrestore(&c->lock, flags);
|
2008-10-16 15:30:07 +02:00
|
|
|
return ERR_PTR(-ENOMEM);
|
2008-10-14 01:45:23 +02:00
|
|
|
}
|
|
|
|
for (col = 0; col < P9_ROW_MAXTAG; col++) {
|
|
|
|
c->reqs[row][col].status = REQ_STATUS_IDLE;
|
2008-10-16 15:30:07 +02:00
|
|
|
c->reqs[row][col].tc = NULL;
|
2008-10-14 01:45:23 +02:00
|
|
|
}
|
|
|
|
c->max_tag += P9_ROW_MAXTAG;
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&c->lock, flags);
|
|
|
|
}
|
|
|
|
row = tag / P9_ROW_MAXTAG;
|
|
|
|
col = tag % P9_ROW_MAXTAG;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
req = &c->reqs[row][col];
|
|
|
|
if (!req->tc) {
|
|
|
|
req->wq = kmalloc(sizeof(wait_queue_head_t), GFP_KERNEL);
|
|
|
|
if (!req->wq) {
|
|
|
|
printk(KERN_ERR "Couldn't grow tag array\n");
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
}
|
|
|
|
init_waitqueue_head(req->wq);
|
|
|
|
req->tc = kmalloc(sizeof(struct p9_fcall)+c->msize,
|
|
|
|
GFP_KERNEL);
|
|
|
|
req->rc = kmalloc(sizeof(struct p9_fcall)+c->msize,
|
|
|
|
GFP_KERNEL);
|
|
|
|
if ((!req->tc) || (!req->rc)) {
|
|
|
|
printk(KERN_ERR "Couldn't grow tag array\n");
|
|
|
|
kfree(req->tc);
|
|
|
|
kfree(req->rc);
|
2008-10-23 23:33:25 +02:00
|
|
|
kfree(req->wq);
|
|
|
|
req->tc = req->rc = NULL;
|
|
|
|
req->wq = NULL;
|
2008-10-16 15:30:07 +02:00
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
}
|
|
|
|
req->tc->sdata = (char *) req->tc + sizeof(struct p9_fcall);
|
|
|
|
req->tc->capacity = c->msize;
|
|
|
|
req->rc->sdata = (char *) req->rc + sizeof(struct p9_fcall);
|
|
|
|
req->rc->capacity = c->msize;
|
|
|
|
}
|
|
|
|
|
|
|
|
p9pdu_reset(req->tc);
|
|
|
|
p9pdu_reset(req->rc);
|
|
|
|
|
|
|
|
req->tc->tag = tag-1;
|
|
|
|
req->status = REQ_STATUS_ALLOC;
|
2008-10-14 01:45:23 +02:00
|
|
|
|
|
|
|
return &c->reqs[row][col];
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* p9_tag_lookup - lookup a request by tag
|
|
|
|
* @c: client session to lookup tag within
|
|
|
|
* @tag: numeric id for transaction
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct p9_req_t *p9_tag_lookup(struct p9_client *c, u16 tag)
|
|
|
|
{
|
|
|
|
int row, col;
|
|
|
|
|
|
|
|
/* This looks up the original request by tag so we know which
|
|
|
|
* buffer to read the data into */
|
|
|
|
tag++;
|
|
|
|
|
|
|
|
BUG_ON(tag >= c->max_tag);
|
|
|
|
|
|
|
|
row = tag / P9_ROW_MAXTAG;
|
|
|
|
col = tag % P9_ROW_MAXTAG;
|
|
|
|
|
|
|
|
return &c->reqs[row][col];
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_tag_lookup);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* p9_tag_init - setup tags structure and contents
|
2009-07-19 21:41:55 +02:00
|
|
|
* @c: v9fs client struct
|
2008-10-14 01:45:23 +02:00
|
|
|
*
|
|
|
|
* This initializes the tags structure for each client instance.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int p9_tag_init(struct p9_client *c)
|
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
c->tagpool = p9_idpool_create();
|
|
|
|
if (IS_ERR(c->tagpool)) {
|
|
|
|
err = PTR_ERR(c->tagpool);
|
|
|
|
c->tagpool = NULL;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
p9_idpool_get(c->tagpool); /* reserve tag 0 */
|
|
|
|
|
|
|
|
c->max_tag = 0;
|
|
|
|
error:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* p9_tag_cleanup - cleans up tags structure and reclaims resources
|
2009-07-19 21:41:55 +02:00
|
|
|
* @c: v9fs client struct
|
2008-10-14 01:45:23 +02:00
|
|
|
*
|
|
|
|
* This frees resources associated with the tags structure
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static void p9_tag_cleanup(struct p9_client *c)
|
|
|
|
{
|
|
|
|
int row, col;
|
|
|
|
|
|
|
|
/* check to insure all requests are idle */
|
|
|
|
for (row = 0; row < (c->max_tag/P9_ROW_MAXTAG); row++) {
|
|
|
|
for (col = 0; col < P9_ROW_MAXTAG; col++) {
|
|
|
|
if (c->reqs[row][col].status != REQ_STATUS_IDLE) {
|
|
|
|
P9_DPRINTK(P9_DEBUG_MUX,
|
|
|
|
"Attempting to cleanup non-free tag %d,%d\n",
|
|
|
|
row, col);
|
|
|
|
/* TODO: delay execution of cleanup */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c->tagpool)
|
|
|
|
p9_idpool_destroy(c->tagpool);
|
|
|
|
|
|
|
|
/* free requests associated with tags */
|
|
|
|
for (row = 0; row < (c->max_tag/P9_ROW_MAXTAG); row++) {
|
2008-10-16 15:30:07 +02:00
|
|
|
for (col = 0; col < P9_ROW_MAXTAG; col++) {
|
2008-10-14 01:45:23 +02:00
|
|
|
kfree(c->reqs[row][col].wq);
|
2008-10-16 15:30:07 +02:00
|
|
|
kfree(c->reqs[row][col].tc);
|
|
|
|
kfree(c->reqs[row][col].rc);
|
|
|
|
}
|
2008-10-14 01:45:23 +02:00
|
|
|
kfree(c->reqs[row]);
|
|
|
|
}
|
|
|
|
c->max_tag = 0;
|
|
|
|
}
|
|
|
|
|
2008-10-14 01:45:22 +02:00
|
|
|
/**
|
|
|
|
* p9_free_req - free a request and clean-up as necessary
|
|
|
|
* c: client state
|
|
|
|
* r: request to release
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
static void p9_free_req(struct p9_client *c, struct p9_req_t *r)
|
2008-10-14 01:45:22 +02:00
|
|
|
{
|
2008-10-16 15:30:07 +02:00
|
|
|
int tag = r->tc->tag;
|
|
|
|
P9_DPRINTK(P9_DEBUG_MUX, "clnt %p req %p tag: %d\n", c, r, tag);
|
|
|
|
|
2008-10-14 01:45:22 +02:00
|
|
|
r->status = REQ_STATUS_IDLE;
|
2008-10-16 15:30:07 +02:00
|
|
|
if (tag != P9_NOTAG && p9_idpool_check(tag, c->tagpool))
|
|
|
|
p9_idpool_put(tag, c->tagpool);
|
2008-10-14 01:45:22 +02:00
|
|
|
}
|
|
|
|
|
2008-10-14 01:45:21 +02:00
|
|
|
/**
|
|
|
|
* p9_client_cb - call back from transport to client
|
|
|
|
* c: client state
|
|
|
|
* req: request received
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
void p9_client_cb(struct p9_client *c, struct p9_req_t *req)
|
|
|
|
{
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_MUX, " tag %d\n", req->tc->tag);
|
2009-04-05 23:28:59 +02:00
|
|
|
wake_up(req->wq);
|
|
|
|
P9_DPRINTK(P9_DEBUG_MUX, "wakeup: %d\n", req->tc->tag);
|
2008-10-14 01:45:21 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_cb);
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
/**
|
|
|
|
* p9_parse_header - parse header arguments out of a packet
|
|
|
|
* @pdu: packet to parse
|
|
|
|
* @size: size of packet
|
|
|
|
* @type: type of request
|
|
|
|
* @tag: tag of packet
|
|
|
|
* @rewind: set if we need to rewind offset afterwards
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
p9_parse_header(struct p9_fcall *pdu, int32_t *size, int8_t *type, int16_t *tag,
|
|
|
|
int rewind)
|
|
|
|
{
|
|
|
|
int8_t r_type;
|
|
|
|
int16_t r_tag;
|
|
|
|
int32_t r_size;
|
|
|
|
int offset = pdu->offset;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
pdu->offset = 0;
|
|
|
|
if (pdu->size == 0)
|
|
|
|
pdu->size = 7;
|
|
|
|
|
|
|
|
err = p9pdu_readf(pdu, 0, "dbw", &r_size, &r_type, &r_tag);
|
|
|
|
if (err)
|
|
|
|
goto rewind_and_exit;
|
|
|
|
|
|
|
|
pdu->size = r_size;
|
|
|
|
pdu->id = r_type;
|
|
|
|
pdu->tag = r_tag;
|
|
|
|
|
2008-10-17 23:20:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< size=%d type: %d tag: %d\n", pdu->size,
|
|
|
|
pdu->id, pdu->tag);
|
2008-10-16 15:30:07 +02:00
|
|
|
|
|
|
|
if (type)
|
|
|
|
*type = r_type;
|
|
|
|
if (tag)
|
|
|
|
*tag = r_tag;
|
|
|
|
if (size)
|
|
|
|
*size = r_size;
|
|
|
|
|
|
|
|
|
|
|
|
rewind_and_exit:
|
|
|
|
if (rewind)
|
|
|
|
pdu->offset = offset;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_parse_header);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* p9_check_errors - check 9p packet for error return and process it
|
|
|
|
* @c: current client instance
|
|
|
|
* @req: request to parse and check for error conditions
|
|
|
|
*
|
|
|
|
* returns error code if one is discovered, otherwise returns 0
|
|
|
|
*
|
|
|
|
* this will have to be more complicated if we have multiple
|
|
|
|
* error packet types
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int p9_check_errors(struct p9_client *c, struct p9_req_t *req)
|
|
|
|
{
|
|
|
|
int8_t type;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = p9_parse_header(req->rc, NULL, &type, NULL, 0);
|
|
|
|
if (err) {
|
|
|
|
P9_DPRINTK(P9_DEBUG_ERROR, "couldn't parse header %d\n", err);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type == P9_RERROR) {
|
|
|
|
int ecode;
|
|
|
|
char *ename;
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
err = p9pdu_readf(req->rc, c->proto_version, "s?d",
|
|
|
|
&ename, &ecode);
|
2008-10-16 15:30:07 +02:00
|
|
|
if (err) {
|
|
|
|
P9_DPRINTK(P9_DEBUG_ERROR, "couldn't parse error%d\n",
|
|
|
|
err);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
if (p9_is_proto_dotu(c))
|
2008-10-16 15:30:07 +02:00
|
|
|
err = -ecode;
|
|
|
|
|
2009-08-17 23:38:45 +02:00
|
|
|
if (!err || !IS_ERR_VALUE(err))
|
2008-10-16 15:30:07 +02:00
|
|
|
err = p9_errstr2errno(ename, strlen(ename));
|
|
|
|
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< RERROR (%d) %s\n", -ecode, ename);
|
|
|
|
|
|
|
|
kfree(ename);
|
|
|
|
} else
|
|
|
|
err = 0;
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* p9_client_flush - flush (cancel) a request
|
2009-07-19 21:41:55 +02:00
|
|
|
* @c: client state
|
|
|
|
* @oldreq: request to cancel
|
2008-10-16 15:30:07 +02:00
|
|
|
*
|
|
|
|
* This sents a flush for a particular requests and links
|
|
|
|
* the flush request to the original request. The current
|
|
|
|
* code only supports a single flush request although the protocol
|
|
|
|
* allows for multiple flush requests to be sent for a single request.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int p9_client_flush(struct p9_client *c, struct p9_req_t *oldreq)
|
|
|
|
{
|
|
|
|
struct p9_req_t *req;
|
|
|
|
int16_t oldtag;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = p9_parse_header(oldreq->tc, NULL, NULL, &oldtag, 1);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TFLUSH tag %d\n", oldtag);
|
|
|
|
|
|
|
|
req = p9_client_rpc(c, P9_TFLUSH, "w", oldtag);
|
|
|
|
if (IS_ERR(req))
|
|
|
|
return PTR_ERR(req);
|
|
|
|
|
|
|
|
|
2009-04-05 23:28:59 +02:00
|
|
|
/* if we haven't received a response for oldreq,
|
|
|
|
remove it from the list. */
|
|
|
|
spin_lock(&c->lock);
|
|
|
|
if (oldreq->status == REQ_STATUS_FLSH)
|
|
|
|
list_del(&oldreq->req_list);
|
|
|
|
spin_unlock(&c->lock);
|
|
|
|
|
|
|
|
p9_free_req(c, req);
|
2008-10-16 15:30:07 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-10-14 01:45:21 +02:00
|
|
|
/**
|
|
|
|
* p9_client_rpc - issue a request and wait for a response
|
|
|
|
* @c: client session
|
2008-10-16 15:30:07 +02:00
|
|
|
* @type: type of request
|
|
|
|
* @fmt: protocol format string (see protocol.c)
|
2008-10-14 01:45:21 +02:00
|
|
|
*
|
2008-10-16 15:30:07 +02:00
|
|
|
* Returns request structure (which client must free using p9_free_req)
|
2008-10-14 01:45:21 +02:00
|
|
|
*/
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
static struct p9_req_t *
|
|
|
|
p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...)
|
2008-10-14 01:45:21 +02:00
|
|
|
{
|
2008-10-16 15:30:07 +02:00
|
|
|
va_list ap;
|
|
|
|
int tag, err;
|
2008-10-14 01:45:21 +02:00
|
|
|
struct p9_req_t *req;
|
|
|
|
unsigned long flags;
|
|
|
|
int sigpending;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_MUX, "client %p op %d\n", c, type);
|
2008-10-14 01:45:21 +02:00
|
|
|
|
2010-03-30 01:13:59 +02:00
|
|
|
/* we allow for any status other than disconnected */
|
|
|
|
if (c->status == Disconnected)
|
|
|
|
return ERR_PTR(-EIO);
|
|
|
|
|
|
|
|
/* if status is begin_disconnected we allow only clunk request */
|
|
|
|
if ((c->status == BeginDisconnect) && (type != P9_TCLUNK))
|
2008-10-16 15:30:07 +02:00
|
|
|
return ERR_PTR(-EIO);
|
2008-10-14 01:45:21 +02:00
|
|
|
|
|
|
|
if (signal_pending(current)) {
|
|
|
|
sigpending = 1;
|
|
|
|
clear_thread_flag(TIF_SIGPENDING);
|
|
|
|
} else
|
|
|
|
sigpending = 0;
|
|
|
|
|
|
|
|
tag = P9_NOTAG;
|
2008-10-16 15:30:07 +02:00
|
|
|
if (type != P9_TVERSION) {
|
2008-10-14 01:45:21 +02:00
|
|
|
tag = p9_idpool_get(c->tagpool);
|
|
|
|
if (tag < 0)
|
2008-10-16 15:30:07 +02:00
|
|
|
return ERR_PTR(-ENOMEM);
|
2008-10-14 01:45:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
req = p9_tag_alloc(c, tag);
|
2008-10-16 15:30:07 +02:00
|
|
|
if (IS_ERR(req))
|
|
|
|
return req;
|
2008-10-14 01:45:21 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
/* marshall the data */
|
|
|
|
p9pdu_prepare(req->tc, tag, type);
|
|
|
|
va_start(ap, fmt);
|
2010-03-05 19:50:14 +01:00
|
|
|
err = p9pdu_vwritef(req->tc, c->proto_version, fmt, ap);
|
2008-10-16 15:30:07 +02:00
|
|
|
va_end(ap);
|
|
|
|
p9pdu_finalize(req->tc);
|
2008-10-14 01:45:21 +02:00
|
|
|
|
|
|
|
err = c->trans_mod->request(c, req);
|
|
|
|
if (err < 0) {
|
|
|
|
c->status = Disconnected;
|
|
|
|
goto reterr;
|
|
|
|
}
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_MUX, "wait %p tag: %d\n", req->wq, tag);
|
2008-10-14 01:45:21 +02:00
|
|
|
err = wait_event_interruptible(*req->wq,
|
|
|
|
req->status >= REQ_STATUS_RCVD);
|
2009-04-05 23:28:59 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_MUX, "wait %p tag: %d returned %d\n",
|
|
|
|
req->wq, tag, err);
|
2008-10-14 01:45:21 +02:00
|
|
|
|
|
|
|
if (req->status == REQ_STATUS_ERROR) {
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_ERROR, "req_status error %d\n", req->t_err);
|
2008-10-14 01:45:21 +02:00
|
|
|
err = req->t_err;
|
|
|
|
}
|
|
|
|
|
2009-04-05 23:28:59 +02:00
|
|
|
if ((err == -ERESTARTSYS) && (c->status == Connected)) {
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_MUX, "flushing\n");
|
2008-10-14 01:45:21 +02:00
|
|
|
sigpending = 1;
|
|
|
|
clear_thread_flag(TIF_SIGPENDING);
|
|
|
|
|
2009-04-05 23:28:59 +02:00
|
|
|
if (c->trans_mod->cancel(c, req))
|
|
|
|
p9_client_flush(c, req);
|
|
|
|
|
|
|
|
/* if we received the response anyway, don't signal error */
|
|
|
|
if (req->status == REQ_STATUS_RCVD)
|
|
|
|
err = 0;
|
2008-10-14 01:45:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (sigpending) {
|
|
|
|
spin_lock_irqsave(¤t->sighand->siglock, flags);
|
|
|
|
recalc_sigpending();
|
|
|
|
spin_unlock_irqrestore(¤t->sighand->siglock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (err < 0)
|
|
|
|
goto reterr;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
err = p9_check_errors(c, req);
|
|
|
|
if (!err) {
|
|
|
|
P9_DPRINTK(P9_DEBUG_MUX, "exit: client %p op %d\n", c, type);
|
|
|
|
return req;
|
2008-10-14 01:45:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
reterr:
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_MUX, "exit: client %p op %d error: %d\n", c, type,
|
|
|
|
err);
|
2008-10-14 01:45:21 +02:00
|
|
|
p9_free_req(c, req);
|
2008-10-16 15:30:07 +02:00
|
|
|
return ERR_PTR(err);
|
2008-10-14 01:45:21 +02:00
|
|
|
}
|
|
|
|
|
2008-10-14 01:45:24 +02:00
|
|
|
static struct p9_fid *p9_fid_create(struct p9_client *clnt)
|
|
|
|
{
|
2008-10-28 20:22:43 +01:00
|
|
|
int ret;
|
2008-10-14 01:45:24 +02:00
|
|
|
struct p9_fid *fid;
|
2008-10-23 23:31:02 +02:00
|
|
|
unsigned long flags;
|
2008-10-14 01:45:24 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_FID, "clnt %p\n", clnt);
|
2008-10-14 01:45:24 +02:00
|
|
|
fid = kmalloc(sizeof(struct p9_fid), GFP_KERNEL);
|
|
|
|
if (!fid)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
2008-10-28 20:22:43 +01:00
|
|
|
ret = p9_idpool_get(clnt->fidpool);
|
2009-01-19 06:32:11 +01:00
|
|
|
if (ret < 0) {
|
2008-10-28 20:22:43 +01:00
|
|
|
ret = -ENOSPC;
|
2008-10-14 01:45:24 +02:00
|
|
|
goto error;
|
|
|
|
}
|
2008-10-28 20:22:43 +01:00
|
|
|
fid->fid = ret;
|
2008-10-14 01:45:24 +02:00
|
|
|
|
|
|
|
memset(&fid->qid, 0, sizeof(struct p9_qid));
|
|
|
|
fid->mode = -1;
|
2008-11-14 00:38:44 +01:00
|
|
|
fid->uid = current_fsuid();
|
2008-10-14 01:45:24 +02:00
|
|
|
fid->clnt = clnt;
|
2009-11-02 15:39:28 +01:00
|
|
|
fid->rdir = NULL;
|
2008-10-23 23:31:02 +02:00
|
|
|
spin_lock_irqsave(&clnt->lock, flags);
|
2008-10-14 01:45:24 +02:00
|
|
|
list_add(&fid->flist, &clnt->fidlist);
|
2008-10-23 23:31:02 +02:00
|
|
|
spin_unlock_irqrestore(&clnt->lock, flags);
|
2008-10-14 01:45:24 +02:00
|
|
|
|
|
|
|
return fid;
|
|
|
|
|
|
|
|
error:
|
|
|
|
kfree(fid);
|
2008-10-28 20:22:43 +01:00
|
|
|
return ERR_PTR(ret);
|
2008-10-14 01:45:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void p9_fid_destroy(struct p9_fid *fid)
|
|
|
|
{
|
|
|
|
struct p9_client *clnt;
|
2008-10-23 23:31:02 +02:00
|
|
|
unsigned long flags;
|
2008-10-14 01:45:24 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_FID, "fid %d\n", fid->fid);
|
2008-10-14 01:45:24 +02:00
|
|
|
clnt = fid->clnt;
|
|
|
|
p9_idpool_put(fid->fid, clnt->fidpool);
|
2008-10-23 23:31:02 +02:00
|
|
|
spin_lock_irqsave(&clnt->lock, flags);
|
2008-10-14 01:45:24 +02:00
|
|
|
list_del(&fid->flist);
|
2008-10-23 23:31:02 +02:00
|
|
|
spin_unlock_irqrestore(&clnt->lock, flags);
|
2009-11-02 15:39:28 +01:00
|
|
|
kfree(fid->rdir);
|
2008-10-14 01:45:24 +02:00
|
|
|
kfree(fid);
|
|
|
|
}
|
2008-02-07 02:25:03 +01:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
int p9_client_version(struct p9_client *c)
|
2007-07-11 00:57:28 +02:00
|
|
|
{
|
2008-10-14 03:36:14 +02:00
|
|
|
int err = 0;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_req_t *req;
|
|
|
|
char *version;
|
|
|
|
int msize;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TVERSION msize %d protocol %d\n",
|
|
|
|
c->msize, c->proto_version);
|
2010-03-05 19:51:04 +01:00
|
|
|
|
|
|
|
switch (c->proto_version) {
|
2010-03-08 18:33:04 +01:00
|
|
|
case p9_proto_2000L:
|
2010-03-05 19:51:04 +01:00
|
|
|
req = p9_client_rpc(c, P9_TVERSION, "ds",
|
2010-03-08 18:33:04 +01:00
|
|
|
c->msize, "9P2000.L");
|
2010-03-05 19:51:04 +01:00
|
|
|
break;
|
|
|
|
case p9_proto_2000u:
|
|
|
|
req = p9_client_rpc(c, P9_TVERSION, "ds",
|
|
|
|
c->msize, "9P2000.u");
|
|
|
|
break;
|
|
|
|
case p9_proto_legacy:
|
|
|
|
req = p9_client_rpc(c, P9_TVERSION, "ds",
|
|
|
|
c->msize, "9P2000");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
if (IS_ERR(req))
|
|
|
|
return PTR_ERR(req);
|
2008-10-14 03:36:14 +02:00
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
err = p9pdu_readf(req->rc, c->proto_version, "ds", &msize, &version);
|
2008-10-16 15:30:07 +02:00
|
|
|
if (err) {
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "version error %d\n", err);
|
2008-10-17 23:20:07 +02:00
|
|
|
p9pdu_dump(1, req->rc);
|
2008-10-14 03:36:14 +02:00
|
|
|
goto error;
|
2008-10-16 15:30:07 +02:00
|
|
|
}
|
2008-10-14 03:36:14 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< RVERSION msize %d %s\n", msize, version);
|
2010-03-08 18:33:04 +01:00
|
|
|
if (!strncmp(version, "9P2000.L", 8))
|
|
|
|
c->proto_version = p9_proto_2000L;
|
2010-03-05 19:51:04 +01:00
|
|
|
else if (!strncmp(version, "9P2000.u", 8))
|
2010-03-05 19:50:14 +01:00
|
|
|
c->proto_version = p9_proto_2000u;
|
|
|
|
else if (!strncmp(version, "9P2000", 6))
|
|
|
|
c->proto_version = p9_proto_legacy;
|
2008-10-14 03:36:14 +02:00
|
|
|
else {
|
|
|
|
err = -EREMOTEIO;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
if (msize < c->msize)
|
|
|
|
c->msize = msize;
|
2008-10-14 03:36:14 +02:00
|
|
|
|
|
|
|
error:
|
2008-10-16 15:30:07 +02:00
|
|
|
kfree(version);
|
|
|
|
p9_free_req(c, req);
|
2008-10-14 03:36:14 +02:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
2008-10-16 15:30:07 +02:00
|
|
|
EXPORT_SYMBOL(p9_client_version);
|
2008-10-14 03:36:14 +02:00
|
|
|
|
|
|
|
struct p9_client *p9_client_create(const char *dev_name, char *options)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
struct p9_client *clnt;
|
|
|
|
|
|
|
|
err = 0;
|
2007-07-11 00:57:28 +02:00
|
|
|
clnt = kmalloc(sizeof(struct p9_client), GFP_KERNEL);
|
|
|
|
if (!clnt)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
2008-09-24 23:22:23 +02:00
|
|
|
clnt->trans_mod = NULL;
|
2008-03-07 17:53:53 +01:00
|
|
|
clnt->trans = NULL;
|
2007-07-11 00:57:28 +02:00
|
|
|
spin_lock_init(&clnt->lock);
|
|
|
|
INIT_LIST_HEAD(&clnt->fidlist);
|
|
|
|
|
2008-10-14 01:45:23 +02:00
|
|
|
p9_tag_init(clnt);
|
|
|
|
|
2008-03-07 17:53:53 +01:00
|
|
|
err = parse_opts(options, clnt);
|
|
|
|
if (err < 0)
|
2010-02-09 01:18:34 +01:00
|
|
|
goto free_client;
|
2008-03-07 17:53:53 +01:00
|
|
|
|
2009-07-14 20:24:10 +02:00
|
|
|
if (!clnt->trans_mod)
|
|
|
|
clnt->trans_mod = v9fs_get_default_trans();
|
|
|
|
|
2008-02-07 02:25:03 +01:00
|
|
|
if (clnt->trans_mod == NULL) {
|
|
|
|
err = -EPROTONOSUPPORT;
|
|
|
|
P9_DPRINTK(P9_DEBUG_ERROR,
|
|
|
|
"No transport defined or default transport\n");
|
2010-02-09 01:18:34 +01:00
|
|
|
goto free_client;
|
|
|
|
}
|
|
|
|
|
|
|
|
clnt->fidpool = p9_idpool_create();
|
|
|
|
if (IS_ERR(clnt->fidpool)) {
|
|
|
|
err = PTR_ERR(clnt->fidpool);
|
|
|
|
clnt->fidpool = NULL;
|
|
|
|
goto put_trans;
|
2008-02-07 02:25:03 +01:00
|
|
|
}
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
P9_DPRINTK(P9_DEBUG_MUX, "clnt %p trans %p msize %d protocol %d\n",
|
|
|
|
clnt, clnt->trans_mod, clnt->msize, clnt->proto_version);
|
2008-02-07 02:25:03 +01:00
|
|
|
|
2008-10-14 01:45:25 +02:00
|
|
|
err = clnt->trans_mod->create(clnt, dev_name, options);
|
|
|
|
if (err)
|
2010-02-09 01:18:34 +01:00
|
|
|
goto destroy_fidpool;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-02-07 02:25:03 +01:00
|
|
|
if ((clnt->msize+P9_IOHDRSZ) > clnt->trans_mod->maxsize)
|
|
|
|
clnt->msize = clnt->trans_mod->maxsize-P9_IOHDRSZ;
|
|
|
|
|
2008-10-14 03:36:14 +02:00
|
|
|
err = p9_client_version(clnt);
|
2007-07-11 00:57:28 +02:00
|
|
|
if (err)
|
2010-02-09 01:18:34 +01:00
|
|
|
goto close_trans;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
|
|
|
return clnt;
|
|
|
|
|
2010-02-09 01:18:34 +01:00
|
|
|
close_trans:
|
|
|
|
clnt->trans_mod->close(clnt);
|
|
|
|
destroy_fidpool:
|
|
|
|
p9_idpool_destroy(clnt->fidpool);
|
|
|
|
put_trans:
|
|
|
|
v9fs_put_trans(clnt->trans_mod);
|
|
|
|
free_client:
|
|
|
|
kfree(clnt);
|
2007-07-11 00:57:28 +02:00
|
|
|
return ERR_PTR(err);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_create);
|
|
|
|
|
|
|
|
void p9_client_destroy(struct p9_client *clnt)
|
|
|
|
{
|
|
|
|
struct p9_fid *fid, *fidptr;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_MUX, "clnt %p\n", clnt);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-14 01:45:25 +02:00
|
|
|
if (clnt->trans_mod)
|
|
|
|
clnt->trans_mod->close(clnt);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-09-24 23:22:23 +02:00
|
|
|
v9fs_put_trans(clnt->trans_mod);
|
|
|
|
|
2010-03-30 01:13:59 +02:00
|
|
|
list_for_each_entry_safe(fid, fidptr, &clnt->fidlist, flist) {
|
|
|
|
printk(KERN_INFO "Found fid %d not clunked\n", fid->fid);
|
2007-07-11 00:57:28 +02:00
|
|
|
p9_fid_destroy(fid);
|
2010-03-30 01:13:59 +02:00
|
|
|
}
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2007-07-13 23:47:58 +02:00
|
|
|
if (clnt->fidpool)
|
|
|
|
p9_idpool_destroy(clnt->fidpool);
|
|
|
|
|
2008-10-14 01:45:23 +02:00
|
|
|
p9_tag_cleanup(clnt);
|
|
|
|
|
2007-07-11 00:57:28 +02:00
|
|
|
kfree(clnt);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_destroy);
|
|
|
|
|
|
|
|
void p9_client_disconnect(struct p9_client *clnt)
|
|
|
|
{
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "clnt %p\n", clnt);
|
2008-10-14 01:45:25 +02:00
|
|
|
clnt->status = Disconnected;
|
2007-07-11 00:57:28 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_disconnect);
|
|
|
|
|
2010-03-30 01:13:59 +02:00
|
|
|
void p9_client_begin_disconnect(struct p9_client *clnt)
|
|
|
|
{
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "clnt %p\n", clnt);
|
|
|
|
clnt->status = BeginDisconnect;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_begin_disconnect);
|
|
|
|
|
2007-07-11 00:57:28 +02:00
|
|
|
struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,
|
2007-10-17 21:31:07 +02:00
|
|
|
char *uname, u32 n_uname, char *aname)
|
2007-07-11 00:57:28 +02:00
|
|
|
{
|
|
|
|
int err;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_req_t *req;
|
2007-07-11 00:57:28 +02:00
|
|
|
struct p9_fid *fid;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_qid qid;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TATTACH afid %d uname %s aname %s\n",
|
|
|
|
afid ? afid->fid : -1, uname, aname);
|
2007-07-11 00:57:28 +02:00
|
|
|
err = 0;
|
|
|
|
|
|
|
|
fid = p9_fid_create(clnt);
|
|
|
|
if (IS_ERR(fid)) {
|
|
|
|
err = PTR_ERR(fid);
|
|
|
|
fid = NULL;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
req = p9_client_rpc(clnt, P9_TATTACH, "ddss?d", fid->fid,
|
|
|
|
afid ? afid->fid : P9_NOFID, uname, aname, n_uname);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
2007-07-11 00:57:28 +02:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
err = p9pdu_readf(req->rc, clnt->proto_version, "Q", &qid);
|
2008-10-16 15:30:07 +02:00
|
|
|
if (err) {
|
2008-10-17 23:20:07 +02:00
|
|
|
p9pdu_dump(1, req->rc);
|
2008-10-16 15:30:07 +02:00
|
|
|
p9_free_req(clnt, req);
|
2007-07-11 00:57:28 +02:00
|
|
|
goto error;
|
2008-10-16 15:30:07 +02:00
|
|
|
}
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< RATTACH qid %x.%llx.%x\n",
|
net/9p: fix printk format warnings
Fix printk format warnings in net/9p.
Built cleanly on 7 arches.
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
2008-11-05 05:46:46 +01:00
|
|
|
qid.type,
|
|
|
|
(unsigned long long)qid.path,
|
|
|
|
qid.version);
|
2008-10-16 15:30:07 +02:00
|
|
|
|
|
|
|
memmove(&fid->qid, &qid, sizeof(struct p9_qid));
|
|
|
|
|
|
|
|
p9_free_req(clnt, req);
|
2007-07-11 00:57:28 +02:00
|
|
|
return fid;
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (fid)
|
|
|
|
p9_fid_destroy(fid);
|
|
|
|
return ERR_PTR(err);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_attach);
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_fid *
|
|
|
|
p9_client_auth(struct p9_client *clnt, char *uname, u32 n_uname, char *aname)
|
2007-07-11 00:57:28 +02:00
|
|
|
{
|
|
|
|
int err;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_req_t *req;
|
|
|
|
struct p9_qid qid;
|
|
|
|
struct p9_fid *afid;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TAUTH uname %s aname %s\n", uname, aname);
|
2007-07-11 00:57:28 +02:00
|
|
|
err = 0;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
afid = p9_fid_create(clnt);
|
|
|
|
if (IS_ERR(afid)) {
|
|
|
|
err = PTR_ERR(afid);
|
|
|
|
afid = NULL;
|
2007-07-11 00:57:28 +02:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
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);
|
2007-07-11 00:57:28 +02:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
err = p9pdu_readf(req->rc, clnt->proto_version, "Q", &qid);
|
2008-10-16 15:30:07 +02:00
|
|
|
if (err) {
|
2008-10-17 23:20:07 +02:00
|
|
|
p9pdu_dump(1, req->rc);
|
2008-10-16 15:30:07 +02:00
|
|
|
p9_free_req(clnt, req);
|
2007-07-11 00:57:28 +02:00
|
|
|
goto error;
|
2008-10-16 15:30:07 +02:00
|
|
|
}
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< RAUTH qid %x.%llx.%x\n",
|
net/9p: fix printk format warnings
Fix printk format warnings in net/9p.
Built cleanly on 7 arches.
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
2008-11-05 05:46:46 +01:00
|
|
|
qid.type,
|
|
|
|
(unsigned long long)qid.path,
|
|
|
|
qid.version);
|
2008-10-16 15:30:07 +02:00
|
|
|
|
|
|
|
memmove(&afid->qid, &qid, sizeof(struct p9_qid));
|
|
|
|
p9_free_req(clnt, req);
|
|
|
|
return afid;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
|
|
|
error:
|
2008-10-16 15:30:07 +02:00
|
|
|
if (afid)
|
|
|
|
p9_fid_destroy(afid);
|
2007-07-11 00:57:28 +02:00
|
|
|
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)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
struct p9_client *clnt;
|
|
|
|
struct p9_fid *fid;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_qid *wqids;
|
|
|
|
struct p9_req_t *req;
|
|
|
|
int16_t nwqids, count;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
|
|
|
err = 0;
|
|
|
|
clnt = oldfid->clnt;
|
|
|
|
if (clone) {
|
|
|
|
fid = p9_fid_create(clnt);
|
|
|
|
if (IS_ERR(fid)) {
|
|
|
|
err = PTR_ERR(fid);
|
|
|
|
fid = NULL;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
fid->uid = oldfid->uid;
|
|
|
|
} else
|
|
|
|
fid = oldfid;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TWALK fids %d,%d nwname %d wname[0] %s\n",
|
|
|
|
oldfid->fid, fid->fid, nwname, wnames ? wnames[0] : NULL);
|
|
|
|
|
|
|
|
req = p9_client_rpc(clnt, P9_TWALK, "ddT", oldfid->fid, fid->fid,
|
|
|
|
nwname, wnames);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
2007-07-11 00:57:28 +02:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
err = p9pdu_readf(req->rc, clnt->proto_version, "R", &nwqids, &wqids);
|
2008-10-17 23:20:07 +02:00
|
|
|
if (err) {
|
|
|
|
p9pdu_dump(1, req->rc);
|
|
|
|
p9_free_req(clnt, req);
|
2008-10-16 15:30:07 +02:00
|
|
|
goto clunk_fid;
|
2008-10-17 23:20:07 +02:00
|
|
|
}
|
|
|
|
p9_free_req(clnt, req);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< RWALK nwqid %d:\n", nwqids);
|
|
|
|
|
|
|
|
if (nwqids != nwname) {
|
2007-07-11 00:57:28 +02:00
|
|
|
err = -ENOENT;
|
|
|
|
goto clunk_fid;
|
|
|
|
}
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
for (count = 0; count < nwqids; count++)
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< [%d] %x.%llx.%x\n",
|
net/9p: fix printk format warnings
Fix printk format warnings in net/9p.
Built cleanly on 7 arches.
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
2008-11-05 05:46:46 +01:00
|
|
|
count, wqids[count].type,
|
|
|
|
(unsigned long long)wqids[count].path,
|
2008-10-16 15:30:07 +02:00
|
|
|
wqids[count].version);
|
|
|
|
|
2007-07-11 00:57:28 +02:00
|
|
|
if (nwname)
|
2008-10-16 15:30:07 +02:00
|
|
|
memmove(&fid->qid, &wqids[nwqids - 1], sizeof(struct p9_qid));
|
2007-07-11 00:57:28 +02:00
|
|
|
else
|
|
|
|
fid->qid = oldfid->qid;
|
|
|
|
|
|
|
|
return fid;
|
|
|
|
|
|
|
|
clunk_fid:
|
2008-10-16 15:30:07 +02:00
|
|
|
p9_client_clunk(fid);
|
|
|
|
fid = NULL;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
|
|
|
error:
|
|
|
|
if (fid && (fid != oldfid))
|
|
|
|
p9_fid_destroy(fid);
|
|
|
|
|
|
|
|
return ERR_PTR(err);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_walk);
|
|
|
|
|
|
|
|
int p9_client_open(struct p9_fid *fid, int mode)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
struct p9_client *clnt;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_req_t *req;
|
|
|
|
struct p9_qid qid;
|
|
|
|
int iounit;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TOPEN fid %d mode %d\n", fid->fid, mode);
|
2007-07-11 00:57:28 +02:00
|
|
|
err = 0;
|
|
|
|
clnt = fid->clnt;
|
|
|
|
|
|
|
|
if (fid->mode != -1)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
req = p9_client_rpc(clnt, P9_TOPEN, "db", fid->fid, mode);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto error;
|
2007-07-11 00:57:28 +02:00
|
|
|
}
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
err = p9pdu_readf(req->rc, clnt->proto_version, "Qd", &qid, &iounit);
|
2008-10-17 23:20:07 +02:00
|
|
|
if (err) {
|
|
|
|
p9pdu_dump(1, req->rc);
|
|
|
|
goto free_and_error;
|
|
|
|
}
|
2008-10-16 15:30:07 +02:00
|
|
|
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< ROPEN qid %x.%llx.%x iounit %x\n",
|
net/9p: fix printk format warnings
Fix printk format warnings in net/9p.
Built cleanly on 7 arches.
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
2008-11-05 05:46:46 +01:00
|
|
|
qid.type,
|
|
|
|
(unsigned long long)qid.path,
|
|
|
|
qid.version, iounit);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
|
|
|
fid->mode = mode;
|
2008-10-16 15:30:07 +02:00
|
|
|
fid->iounit = iounit;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-17 23:20:07 +02:00
|
|
|
free_and_error:
|
|
|
|
p9_free_req(clnt, req);
|
2008-10-16 15:30:07 +02:00
|
|
|
error:
|
2007-07-11 00:57:28 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_open);
|
|
|
|
|
|
|
|
int p9_client_fcreate(struct p9_fid *fid, char *name, u32 perm, int mode,
|
|
|
|
char *extension)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
struct p9_client *clnt;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_req_t *req;
|
|
|
|
struct p9_qid qid;
|
|
|
|
int iounit;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TCREATE fid %d name %s perm %d mode %d\n",
|
|
|
|
fid->fid, name, perm, mode);
|
2007-07-11 00:57:28 +02:00
|
|
|
err = 0;
|
|
|
|
clnt = fid->clnt;
|
|
|
|
|
|
|
|
if (fid->mode != -1)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
req = p9_client_rpc(clnt, P9_TCREATE, "dsdb?s", fid->fid, name, perm,
|
|
|
|
mode, extension);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto error;
|
2007-07-11 00:57:28 +02:00
|
|
|
}
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
err = p9pdu_readf(req->rc, clnt->proto_version, "Qd", &qid, &iounit);
|
2008-10-17 23:20:07 +02:00
|
|
|
if (err) {
|
|
|
|
p9pdu_dump(1, req->rc);
|
|
|
|
goto free_and_error;
|
|
|
|
}
|
2008-10-16 15:30:07 +02:00
|
|
|
|
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< RCREATE qid %x.%llx.%x iounit %x\n",
|
net/9p: fix printk format warnings
Fix printk format warnings in net/9p.
Built cleanly on 7 arches.
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
2008-11-05 05:46:46 +01:00
|
|
|
qid.type,
|
|
|
|
(unsigned long long)qid.path,
|
|
|
|
qid.version, iounit);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
|
|
|
fid->mode = mode;
|
2008-10-16 15:30:07 +02:00
|
|
|
fid->iounit = iounit;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-17 23:20:07 +02:00
|
|
|
free_and_error:
|
|
|
|
p9_free_req(clnt, req);
|
2008-10-16 15:30:07 +02:00
|
|
|
error:
|
2007-07-11 00:57:28 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_fcreate);
|
|
|
|
|
|
|
|
int p9_client_clunk(struct p9_fid *fid)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
struct p9_client *clnt;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_req_t *req;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TCLUNK fid %d\n", fid->fid);
|
2007-07-11 00:57:28 +02:00
|
|
|
err = 0;
|
|
|
|
clnt = fid->clnt;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
req = p9_client_rpc(clnt, P9_TCLUNK, "d", fid->fid);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto error;
|
2007-07-11 00:57:28 +02:00
|
|
|
}
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< RCLUNK fid %d\n", fid->fid);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
p9_free_req(clnt, req);
|
2007-07-11 00:57:28 +02:00
|
|
|
p9_fid_destroy(fid);
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
error:
|
2007-07-11 00:57:28 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_clunk);
|
|
|
|
|
|
|
|
int p9_client_remove(struct p9_fid *fid)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
struct p9_client *clnt;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_req_t *req;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TREMOVE fid %d\n", fid->fid);
|
2007-07-11 00:57:28 +02:00
|
|
|
err = 0;
|
|
|
|
clnt = fid->clnt;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
req = p9_client_rpc(clnt, P9_TREMOVE, "d", fid->fid);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto error;
|
2007-07-11 00:57:28 +02:00
|
|
|
}
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< RREMOVE fid %d\n", fid->fid);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
p9_free_req(clnt, req);
|
2007-07-11 00:57:28 +02:00
|
|
|
p9_fid_destroy(fid);
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
error:
|
2007-07-11 00:57:28 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_remove);
|
|
|
|
|
2008-10-14 03:36:17 +02:00
|
|
|
int
|
|
|
|
p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
|
|
|
|
u32 count)
|
2007-07-11 00:57:28 +02:00
|
|
|
{
|
2008-10-16 15:30:07 +02:00
|
|
|
int err, rsize, total;
|
2007-07-11 00:57:28 +02:00
|
|
|
struct p9_client *clnt;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_req_t *req;
|
|
|
|
char *dataptr;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TREAD fid %d offset %llu %d\n", fid->fid,
|
2007-07-11 00:57:28 +02:00
|
|
|
(long long unsigned) offset, count);
|
|
|
|
err = 0;
|
|
|
|
clnt = fid->clnt;
|
|
|
|
total = 0;
|
|
|
|
|
|
|
|
rsize = fid->iounit;
|
|
|
|
if (!rsize || rsize > clnt->msize-P9_IOHDRSZ)
|
|
|
|
rsize = clnt->msize - P9_IOHDRSZ;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
if (count < rsize)
|
|
|
|
rsize = count;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
req = p9_client_rpc(clnt, P9_TREAD, "dqd", fid->fid, offset, rsize);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto error;
|
|
|
|
}
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
err = p9pdu_readf(req->rc, clnt->proto_version, "D", &count, &dataptr);
|
2008-10-17 23:20:07 +02:00
|
|
|
if (err) {
|
|
|
|
p9pdu_dump(1, req->rc);
|
2008-10-16 15:30:07 +02:00
|
|
|
goto free_and_error;
|
2008-10-17 23:20:07 +02:00
|
|
|
}
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< RREAD count %d\n", count);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
if (data) {
|
|
|
|
memmove(data, dataptr, count);
|
|
|
|
}
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
if (udata) {
|
|
|
|
err = copy_to_user(udata, dataptr, count);
|
|
|
|
if (err) {
|
|
|
|
err = -EFAULT;
|
|
|
|
goto free_and_error;
|
2007-07-11 00:57:28 +02:00
|
|
|
}
|
2008-10-16 15:30:07 +02:00
|
|
|
}
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
p9_free_req(clnt, req);
|
|
|
|
return count;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
free_and_error:
|
|
|
|
p9_free_req(clnt, req);
|
2007-07-11 00:57:28 +02:00
|
|
|
error:
|
|
|
|
return err;
|
|
|
|
}
|
2008-10-14 03:36:17 +02:00
|
|
|
EXPORT_SYMBOL(p9_client_read);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
|
|
|
int
|
2008-10-14 03:36:17 +02:00
|
|
|
p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
|
|
|
|
u64 offset, u32 count)
|
2007-07-11 00:57:28 +02:00
|
|
|
{
|
2008-10-16 15:30:07 +02:00
|
|
|
int err, rsize, total;
|
2007-07-11 00:57:28 +02:00
|
|
|
struct p9_client *clnt;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_req_t *req;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TWRITE fid %d offset %llu count %d\n",
|
|
|
|
fid->fid, (long long unsigned) offset, count);
|
2007-07-11 00:57:28 +02:00
|
|
|
err = 0;
|
|
|
|
clnt = fid->clnt;
|
|
|
|
total = 0;
|
|
|
|
|
|
|
|
rsize = fid->iounit;
|
|
|
|
if (!rsize || rsize > clnt->msize-P9_IOHDRSZ)
|
|
|
|
rsize = clnt->msize - P9_IOHDRSZ;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
if (count < rsize)
|
|
|
|
rsize = count;
|
|
|
|
if (data)
|
|
|
|
req = p9_client_rpc(clnt, P9_TWRITE, "dqD", fid->fid, offset,
|
|
|
|
rsize, data);
|
|
|
|
else
|
|
|
|
req = p9_client_rpc(clnt, P9_TWRITE, "dqU", fid->fid, offset,
|
|
|
|
rsize, udata);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto error;
|
|
|
|
}
|
2008-10-14 03:36:17 +02:00
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
err = p9pdu_readf(req->rc, clnt->proto_version, "d", &count);
|
2008-10-17 23:20:07 +02:00
|
|
|
if (err) {
|
|
|
|
p9pdu_dump(1, req->rc);
|
2008-10-16 15:30:07 +02:00
|
|
|
goto free_and_error;
|
2008-10-17 23:20:07 +02:00
|
|
|
}
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< RWRITE count %d\n", count);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
p9_free_req(clnt, req);
|
|
|
|
return count;
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
free_and_error:
|
|
|
|
p9_free_req(clnt, req);
|
2007-07-11 00:57:28 +02:00
|
|
|
error:
|
|
|
|
return err;
|
|
|
|
}
|
2008-10-14 03:36:17 +02:00
|
|
|
EXPORT_SYMBOL(p9_client_write);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_wstat *p9_client_stat(struct p9_fid *fid)
|
2008-10-14 01:45:24 +02:00
|
|
|
{
|
2008-10-16 15:30:07 +02:00
|
|
|
int err;
|
|
|
|
struct p9_client *clnt;
|
|
|
|
struct p9_wstat *ret = kmalloc(sizeof(struct p9_wstat), GFP_KERNEL);
|
|
|
|
struct p9_req_t *req;
|
|
|
|
u16 ignored;
|
2008-10-14 01:45:24 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TSTAT fid %d\n", fid->fid);
|
2008-10-14 01:45:24 +02:00
|
|
|
|
|
|
|
if (!ret)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
2007-07-11 00:57:28 +02:00
|
|
|
err = 0;
|
|
|
|
clnt = fid->clnt;
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
req = p9_client_rpc(clnt, P9_TSTAT, "d", fid->fid);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
2007-07-11 00:57:28 +02:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
err = p9pdu_readf(req->rc, clnt->proto_version, "wS", &ignored, ret);
|
2008-10-17 23:20:07 +02:00
|
|
|
if (err) {
|
|
|
|
p9pdu_dump(1, req->rc);
|
2009-07-14 20:25:41 +02:00
|
|
|
p9_free_req(clnt, req);
|
|
|
|
goto error;
|
2008-10-17 23:20:07 +02:00
|
|
|
}
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P,
|
2008-10-17 23:20:07 +02:00
|
|
|
"<<< RSTAT sz=%x type=%x dev=%x qid=%x.%llx.%x\n"
|
|
|
|
"<<< mode=%8.8x atime=%8.8x mtime=%8.8x length=%llx\n"
|
|
|
|
"<<< name=%s uid=%s gid=%s muid=%s extension=(%s)\n"
|
|
|
|
"<<< uid=%d gid=%d n_muid=%d\n",
|
2008-10-16 15:30:07 +02:00
|
|
|
ret->size, ret->type, ret->dev, ret->qid.type,
|
net/9p: fix printk format warnings
Fix printk format warnings in net/9p.
Built cleanly on 7 arches.
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
2008-11-05 05:46:46 +01:00
|
|
|
(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,
|
2008-10-17 23:20:07 +02:00
|
|
|
ret->n_uid, ret->n_gid, ret->n_muid);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2009-04-05 23:26:41 +02:00
|
|
|
p9_free_req(clnt, req);
|
|
|
|
return ret;
|
|
|
|
|
2007-07-11 00:57:28 +02:00
|
|
|
error:
|
2009-04-05 23:26:41 +02:00
|
|
|
kfree(ret);
|
|
|
|
return ERR_PTR(err);
|
2007-07-11 00:57:28 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_stat);
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
static int p9_client_statsize(struct p9_wstat *wst, int proto_version)
|
2009-04-05 23:22:16 +02:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2010-01-16 02:01:56 +01:00
|
|
|
/* NOTE: size shouldn't include its own length */
|
2009-04-05 23:22:16 +02:00
|
|
|
/* size[2] type[2] dev[4] qid[13] */
|
|
|
|
/* mode[4] atime[4] mtime[4] length[8]*/
|
|
|
|
/* name[s] uid[s] gid[s] muid[s] */
|
2010-01-16 02:01:56 +01:00
|
|
|
ret = 2+4+13+4+4+4+8+2+2+2+2;
|
2009-04-05 23:22:16 +02:00
|
|
|
|
|
|
|
if (wst->name)
|
|
|
|
ret += strlen(wst->name);
|
|
|
|
if (wst->uid)
|
|
|
|
ret += strlen(wst->uid);
|
|
|
|
if (wst->gid)
|
|
|
|
ret += strlen(wst->gid);
|
|
|
|
if (wst->muid)
|
|
|
|
ret += strlen(wst->muid);
|
|
|
|
|
2010-03-05 19:50:14 +01:00
|
|
|
if (proto_version == p9_proto_2000u) {
|
2009-04-05 23:22:16 +02:00
|
|
|
ret += 2+4+4+4; /* extension[s] n_uid[4] n_gid[4] n_muid[4] */
|
|
|
|
if (wst->extension)
|
|
|
|
ret += strlen(wst->extension);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-07-11 00:57:28 +02:00
|
|
|
int p9_client_wstat(struct p9_fid *fid, struct p9_wstat *wst)
|
|
|
|
{
|
|
|
|
int err;
|
2008-10-16 15:30:07 +02:00
|
|
|
struct p9_req_t *req;
|
2007-07-11 00:57:28 +02:00
|
|
|
struct p9_client *clnt;
|
|
|
|
|
2009-04-05 23:22:16 +02:00
|
|
|
err = 0;
|
|
|
|
clnt = fid->clnt;
|
2010-03-05 19:50:14 +01:00
|
|
|
wst->size = p9_client_statsize(wst, clnt->proto_version);
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, ">>> TWSTAT fid %d\n", fid->fid);
|
2008-10-17 23:20:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P,
|
|
|
|
" sz=%x type=%x dev=%x qid=%x.%llx.%x\n"
|
|
|
|
" mode=%8.8x atime=%8.8x mtime=%8.8x length=%llx\n"
|
|
|
|
" 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,
|
net/9p: fix printk format warnings
Fix printk format warnings in net/9p.
Built cleanly on 7 arches.
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:820: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:867: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:932: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:982: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
net/9p/client.c:1025: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 7 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 8 has type 'u64'
net/9p/client.c:1252: warning: format '%llx' expects type 'long long unsigned int', but argument 13 has type 'u64'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
2008-11-05 05:46:46 +01:00
|
|
|
(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,
|
2008-10-17 23:20:07 +02:00
|
|
|
wst->n_uid, wst->n_gid, wst->n_muid);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2010-01-16 02:01:56 +01:00
|
|
|
req = p9_client_rpc(clnt, P9_TWSTAT, "dwS", fid->fid, wst->size+2, wst);
|
2008-10-16 15:30:07 +02:00
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto error;
|
2007-07-11 00:57:28 +02:00
|
|
|
}
|
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
P9_DPRINTK(P9_DEBUG_9P, "<<< RWSTAT fid %d\n", fid->fid);
|
2007-07-11 00:57:28 +02:00
|
|
|
|
2008-10-16 15:30:07 +02:00
|
|
|
p9_free_req(clnt, req);
|
|
|
|
error:
|
2007-07-11 00:57:28 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(p9_client_wstat);
|