Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: update Documentation pointers
  net/9p: enable 9p to work in non-default network namespace
  net/9p: p9_idpool_get return -1 on error
  fs/9p: Don't clunk dentry fid when we fail to get a writeback inode
  9p: Small cleanup in <net/9p/9p.h>
  9p: remove experimental tag from tested configurations
  9p: typo fixes and minor cleanups
  net/9p: Change linuxdoc names to match functions.
  • Loading branch information
torvalds committed May 25, 2011
2 parents c88bc60 + ee294be commit 2a651c7
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 59 deletions.
29 changes: 10 additions & 19 deletions Documentation/filesystems/9p.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Other applications are described in the following papers:
http://xcpu.org/papers/cellfs-talk.pdf
* PROSE I/O: Using 9p to enable Application Partitions
http://plan9.escet.urjc.es/iwp9/cready/PROSE_iwp9_2006.pdf
* VirtFS: A Virtualization Aware File System pass-through
http://goo.gl/3WPDg

USAGE
=====
Expand Down Expand Up @@ -130,31 +132,20 @@ OPTIONS
RESOURCES
=========

Our current recommendation is to use Inferno (http://www.vitanuova.com/nferno/index.html)
as the 9p server. You can start a 9p server under Inferno by issuing the
following command:
; styxlisten -A tcp!*!564 export '#U*'
Protocol specifications are maintained on github:
http://ericvh.github.com/9p-rfc/

The -A specifies an unauthenticated export. The 564 is the port # (you may
have to choose a higher port number if running as a normal user). The '#U*'
specifies exporting the root of the Linux name space. You may specify a
subset of the namespace by extending the path: '#U*'/tmp would just export
/tmp. For more information, see the Inferno manual pages covering styxlisten
and export.
9p client and server implementations are listed on
http://9p.cat-v.org/implementations

A Linux version of the 9p server is now maintained under the npfs project
on sourceforge (http://sourceforge.net/projects/npfs). The currently
maintained version is the single-threaded version of the server (named spfs)
available from the same SVN repository.
A 9p2000.L server is being developed by LLNL and can be found
at http://code.google.com/p/diod/

There are user and developer mailing lists available through the v9fs project
on sourceforge (http://sourceforge.net/projects/v9fs).

A stand-alone version of the module (which should build for any 2.6 kernel)
is available via (http://github.com/ericvh/9p-sac/tree/master)

News and other information is maintained on SWiK (http://swik.net/v9fs)
and the Wiki (http://sf.net/apps/mediawiki/v9fs/index.php).
News and other information is maintained on a Wiki.
(http://sf.net/apps/mediawiki/v9fs/index.php).

Bug reports may be issued through the kernel.org bugzilla
(http://bugzilla.kernel.org)
Expand Down
5 changes: 2 additions & 3 deletions fs/9p/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config 9P_FS
tristate "Plan 9 Resource Sharing Support (9P2000) (Experimental)"
depends on INET && NET_9P && EXPERIMENTAL
tristate "Plan 9 Resource Sharing Support (9P2000)"
depends on INET && NET_9P
help
If you say Y here, you will get experimental support for
Plan 9 resource sharing via the 9P2000 protocol.
Expand All @@ -10,7 +10,6 @@ config 9P_FS
If unsure, say N.

if 9P_FS

config 9P_FSCACHE
bool "Enable 9P client caching support (EXPERIMENTAL)"
depends on EXPERIMENTAL
Expand Down
11 changes: 6 additions & 5 deletions fs/9p/vfs_inode_dotl.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,16 +259,16 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode,
if (IS_ERR(inode_fid)) {
err = PTR_ERR(inode_fid);
mutex_unlock(&v9inode->v_mutex);
goto error;
goto err_clunk_old_fid;
}
v9inode->writeback_fid = (void *) inode_fid;
}
mutex_unlock(&v9inode->v_mutex);
/* Since we are opening a file, assign the open fid to the file */
filp = lookup_instantiate_filp(nd, dentry, generic_file_open);
if (IS_ERR(filp)) {
p9_client_clunk(ofid);
return PTR_ERR(filp);
err = PTR_ERR(filp);
goto err_clunk_old_fid;
}
filp->private_data = ofid;
#ifdef CONFIG_9P_FSCACHE
Expand All @@ -278,10 +278,11 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode,
return 0;

error:
if (ofid)
p9_client_clunk(ofid);
if (fid)
p9_client_clunk(fid);
err_clunk_old_fid:
if (ofid)
p9_client_clunk(ofid);
return err;
}

Expand Down
13 changes: 6 additions & 7 deletions include/net/9p/9p.h
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@ enum p9_open_mode_t {

/**
* enum p9_perm_t - 9P permissions
* @P9_DMDIR: mode bite for directories
* @P9_DMDIR: mode bit for directories
* @P9_DMAPPEND: mode bit for is append-only
* @P9_DMEXCL: mode bit for excluse use (only one open handle allowed)
* @P9_DMMOUNT: mode bite for mount points
* @P9_DMMOUNT: mode bit for mount points
* @P9_DMAUTH: mode bit for authentication file
* @P9_DMTMP: mode bit for non-backed-up files
* @P9_DMSYMLINK: mode bit for symbolic links (9P2000.u)
Expand Down Expand Up @@ -362,7 +362,7 @@ struct p9_qid {
};

/**
* struct p9_stat - file system metadata information
* struct p9_wstat - file system metadata information
* @size: length prefix for this stat structure instance
* @type: the type of the server (equivalent to a major number)
* @dev: the sub-type of the server (equivalent to a minor number)
Expand Down Expand Up @@ -687,10 +687,10 @@ struct p9_rwstat {
* @size: prefixed length of the structure
* @id: protocol operating identifier of type &p9_msg_t
* @tag: transaction id of the request
* @offset: used by marshalling routines to track currentposition in buffer
* @offset: used by marshalling routines to track current position in buffer
* @capacity: used by marshalling routines to track total malloc'd capacity
* @pubuf: Payload user buffer given by the caller
* @pubuf: Payload kernel buffer given by the caller
* @pkbuf: Payload kernel buffer given by the caller
* @pbuf_size: pubuf/pkbuf(only one will be !NULL) size to be read/write.
* @private: For transport layer's use.
* @sdata: payload
Expand All @@ -714,7 +714,7 @@ struct p9_fcall {
size_t pbuf_size;
void *private;

uint8_t *sdata;
u8 *sdata;
};

struct p9_idpool;
Expand All @@ -728,7 +728,6 @@ void p9_idpool_put(int id, struct p9_idpool *p);
int p9_idpool_check(int id, struct p9_idpool *p);

int p9_error_init(void);
int p9_errstr2errno(char *, int);
int p9_trans_fd_init(void);
void p9_trans_fd_exit(void);
#endif /* NET_9P_H */
2 changes: 1 addition & 1 deletion include/net/9p/client.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ enum p9_trans_status {
};

/**
* enum p9_req_status_t - virtio request status
* enum p9_req_status_t - status of a request
* @REQ_STATUS_IDLE: request slot unused
* @REQ_STATUS_ALLOC: request has been allocated but not sent
* @REQ_STATUS_UNSENT: request waiting to be sent
Expand Down
3 changes: 2 additions & 1 deletion include/net/9p/transport.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,15 @@
* @pref: Preferences of this transport
* @def: set if this transport should be considered the default
* @create: member function to create a new connection on this transport
* @close: member function to discard a connection on this transport
* @request: member function to issue a request to the transport
* @cancel: member function to cancel a request (if it hasn't been sent)
*
* This is the basic API for a transport module which is registered by the
* transport module with the 9P core network module and used by the client
* to instantiate a new connection on a transport.
*
* BUGS: the transport module list isn't protected.
* The transport module list is protected by v9fs_trans_lock.
*/

struct p9_trans_module {
Expand Down
8 changes: 4 additions & 4 deletions net/9p/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#

menuconfig NET_9P
depends on NET && EXPERIMENTAL
tristate "Plan 9 Resource Sharing Support (9P2000) (Experimental)"
depends on NET
tristate "Plan 9 Resource Sharing Support (9P2000)"
help
If you say Y here, you will get experimental support for
Plan 9 resource sharing via the 9P2000 protocol.
Expand All @@ -16,8 +16,8 @@ menuconfig NET_9P
if NET_9P

config NET_9P_VIRTIO
depends on EXPERIMENTAL && VIRTIO
tristate "9P Virtio Transport (Experimental)"
depends on VIRTIO
tristate "9P Virtio Transport"
help
This builds support for a transports between
guest partitions and a host partition.
Expand Down
30 changes: 17 additions & 13 deletions net/9p/client.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ static int get_protocol_version(const substring_t *name)
return version;
}

static struct p9_req_t *
p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...);

/**
* parse_options - parse mount options into client structure
* @opts: options string passed from mount
Expand Down Expand Up @@ -307,12 +304,13 @@ static int p9_tag_init(struct p9_client *c)
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 */

err = p9_idpool_get(c->tagpool); /* reserve tag 0 */
if (err < 0) {
p9_idpool_destroy(c->tagpool);
goto error;
}
c->max_tag = 0;
error:
return err;
Expand Down Expand Up @@ -518,12 +516,15 @@ static int p9_check_errors(struct p9_client *c, struct p9_req_t *req)
return err;
}

static struct p9_req_t *
p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...);

/**
* p9_client_flush - flush (cancel) a request
* @c: client state
* @oldreq: request to cancel
*
* This sents a flush for a particular requests and links
* This sents a flush for a particular request 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.
Expand Down Expand Up @@ -789,11 +790,13 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)
spin_lock_init(&clnt->lock);
INIT_LIST_HEAD(&clnt->fidlist);

p9_tag_init(clnt);
err = p9_tag_init(clnt);
if (err < 0)
goto free_client;

err = parse_opts(options, clnt);
if (err < 0)
goto free_client;
goto destroy_tagpool;

if (!clnt->trans_mod)
clnt->trans_mod = v9fs_get_default_trans();
Expand All @@ -802,13 +805,12 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)
err = -EPROTONOSUPPORT;
P9_DPRINTK(P9_DEBUG_ERROR,
"No transport defined or default transport\n");
goto free_client;
goto destroy_tagpool;
}

clnt->fidpool = p9_idpool_create();
if (IS_ERR(clnt->fidpool)) {
err = PTR_ERR(clnt->fidpool);
clnt->fidpool = NULL;
goto put_trans;
}

Expand All @@ -834,6 +836,8 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)
p9_idpool_destroy(clnt->fidpool);
put_trans:
v9fs_put_trans(clnt->trans_mod);
destroy_tagpool:
p9_idpool_destroy(clnt->tagpool);
free_client:
kfree(clnt);
return ERR_PTR(err);
Expand Down Expand Up @@ -1298,7 +1302,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
if (count < rsize)
rsize = count;

/* Don't bother zerocopy form small IO (< 1024) */
/* Don't bother zerocopy for small IO (< 1024) */
if (((clnt->trans_mod->pref & P9_TRANS_PREF_PAYLOAD_MASK) ==
P9_TRANS_PREF_PAYLOAD_SEP) && (rsize > 1024)) {
req = p9_client_rpc(clnt, P9_TREAD, "dqE", fid->fid, offset,
Expand Down
4 changes: 2 additions & 2 deletions net/9p/mod.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ void v9fs_put_trans(struct p9_trans_module *m)
}

/**
* v9fs_init - Initialize module
* init_p9 - Initialize module
*
*/
static int __init init_p9(void)
Expand All @@ -154,7 +154,7 @@ static int __init init_p9(void)
}

/**
* v9fs_init - shutdown module
* exit_p9 - shutdown module
*
*/

Expand Down
7 changes: 4 additions & 3 deletions net/9p/trans_fd.c
Original file line number Diff line number Diff line change
Expand Up @@ -916,8 +916,8 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)
sin_server.sin_family = AF_INET;
sin_server.sin_addr.s_addr = in_aton(addr);
sin_server.sin_port = htons(opts.port);
err = sock_create_kern(PF_INET, SOCK_STREAM, IPPROTO_TCP, &csocket);

err = __sock_create(read_pnet(&current->nsproxy->net_ns), PF_INET,
SOCK_STREAM, IPPROTO_TCP, &csocket, 1);
if (err) {
P9_EPRINTK(KERN_ERR, "p9_trans_tcp: problem creating socket\n");
return err;
Expand Down Expand Up @@ -954,7 +954,8 @@ p9_fd_create_unix(struct p9_client *client, const char *addr, char *args)

sun_server.sun_family = PF_UNIX;
strcpy(sun_server.sun_path, addr);
err = sock_create_kern(PF_UNIX, SOCK_STREAM, 0, &csocket);
err = __sock_create(read_pnet(&current->nsproxy->net_ns), PF_UNIX,
SOCK_STREAM, 0, &csocket, 1);
if (err < 0) {
P9_EPRINTK(KERN_ERR, "p9_trans_unix: problem creating socket\n");
return err;
Expand Down
2 changes: 1 addition & 1 deletion net/9p/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ int p9_idpool_get(struct p9_idpool *p)

retry:
if (idr_pre_get(&p->pool, GFP_NOFS) == 0)
return 0;
return -1;

spin_lock_irqsave(&p->lock, flags);

Expand Down

0 comments on commit 2a651c7

Please sign in to comment.