v9fs: add extension field to Tcreate
PATCH 1/1 v9fs: add extension field to Tcreate
From: Latchesar Ionkov <[email protected]>
Implement a new way of creating special files. Instead of Tcreate+Twstat, add one more field to Tcreate that contains special file description.
Signed-off-by Latchesar Ionkov <[email protected]>
Signed-off-by Eric Van Hensbergen <[email protected]>
---
fs/9p/9p.c | 8 +++++--- fs/9p/9p.h | 5 +++-- fs/9p/conv.c | 8 +++++++- fs/9p/conv.h | 3 ++- fs/9p/vfs_file.c | 32 +++++++++++++++----------------- fs/9p/vfs_inode.c | 47 +++++++++++++++++++---------------------------- 6 files changed, 51 insertions(+), 52 deletions(-)
3361438e95e7693aac31c9583bbcbb2b1fd0ad04
fs/9p/9p.c +5 -3
@@ -332,8 +332,8 @@ v9fs_t_remove(struct v9fs_session_info **/ int -v9fs_t_create (struct v9fs_session_info *v9ses,u32 fid,char *name, -u32 perm,u8 mode,struct v9fs_fcall **rcp) +v9fs_t_create (struct v9fs_session_info *v9ses,u32 fid,char *name,u32 perm, +u8 mode,char *extension,struct v9fs_fcall **rcp) {int ret;struct v9fs_fcall *tc;
@@ -341,7 +341,9 @@ v9fs_t_create(struct v9fs_session_info *dprintk (DEBUG_9P ,"fid %d name '%s' perm %x mode %d\n" , fid, name, perm, mode); - tc =v9fs_create_tcreate (fid, name, perm, mode); + tc =v9fs_create_tcreate (fid, name, perm, mode, extension, + v9ses->extended); +if (!IS_ERR (tc)) { ret =v9fs_mux_rpc (v9ses->mux, tc, rcp);kfree (tc);
fs/9p/9p.h +3 -2
@@ -235,6 +235,7 @@ struct Tcreate {struct v9fs_str name;u32 perm;u8 mode; +struct v9fs_str extension; };struct Rcreate {
@@ -365,8 +366,8 @@ int v9fs_t_open(struct v9fs_session_infoint v9fs_t_remove (struct v9fs_session_info *v9ses,u32 fid,struct v9fs_fcall **rcall); -int v9fs_t_create (struct v9fs_session_info *v9ses,u32 fid,char *name, -u32 perm,u8 mode,struct v9fs_fcall **rcall); +int v9fs_t_create (struct v9fs_session_info *v9ses,u32 fid,char *name, +u32 perm,u8 mode,char *extension,struct v9fs_fcall **rcall);int v9fs_t_read (struct v9fs_session_info *v9ses,u32 fid,u64 offset,u32 count,struct v9fs_fcall **rcall);
fs/9p/conv.c +7 -1
@@ -664,7 +664,8 @@ struct v9fs_fcall *v9fs_create_topen(u32return fc; } -struct v9fs_fcall *v9fs_create_tcreate (u32 fid,char *name,u32 perm,u8 mode) +struct v9fs_fcall *v9fs_create_tcreate (u32 fid,char *name,u32 perm,u8 mode, +char *extension,int extended) {int size;struct v9fs_fcall *fc;
@@ -672,6 +673,9 @@ struct v9fs_fcall *v9fs_create_tcreate(ustruct cbuf *bufp = &buffer; size =4 +2 +strlen (name) +4 +1 ;/* fid[4] name[s] perm[4] mode[1] */ +if (extended && extension!=NULL ) + size +=2 +strlen (extension);/* extension[s] */ + fc =v9fs_create_common (bufp, size,TCREATE );if (IS_ERR (fc)) goto error;
@@ -680,6 +684,8 @@ struct v9fs_fcall *v9fs_create_tcreate(uv9fs_put_str (bufp, name, &fc->params.tcreate.name);v9fs_put_int32 (bufp, perm, &fc->params.tcreate.perm);v9fs_put_int8 (bufp, mode, &fc->params.tcreate.mode); +if (extended) +v9fs_put_str (bufp, extension, &fc->params.tcreate.extension);if (buf_check_overflow (bufp)) {kfree (fc);
fs/9p/conv.h +2 -1
@@ -40,7 +40,8 @@ struct v9fs_fcall *v9fs_create_tflush(u1struct v9fs_fcall *v9fs_create_twalk (u32 fid,u32 newfid,u16 nwname,char **wnames);struct v9fs_fcall *v9fs_create_topen (u32 fid,u8 mode); -struct v9fs_fcall *v9fs_create_tcreate (u32 fid,char *name,u32 perm,u8 mode); +struct v9fs_fcall *v9fs_create_tcreate (u32 fid,char *name,u32 perm,u8 mode, +char *extension,int extended);struct v9fs_fcall *v9fs_create_tread (u32 fid,u64 offset,u32 count);struct v9fs_fcall *v9fs_create_twrite (u32 fid,u64 offset,u32 count,const char __user *data);
fs/9p/vfs_file.c +15 -17
@@ -69,29 +69,30 @@ int v9fs_file_open(struct inode *inode, fid =v9fs_get_idpool (&v9ses->fidpool);if (fid <0 ) { -eprintk (KERN_WARNING ,"newfid fails!\n" ); -return -ENOSPC ; - } +eprintk (KERN_WARNING ,"newfid fails!\n" ); +return -ENOSPC ; + } err =v9fs_t_walk (v9ses, vfid->fid, fid,NULL ,NULL );if (err <0 ) { -dprintk (DEBUG_ERROR ,"rewalk didn't work\n" ); +dprintk (DEBUG_ERROR ,"rewalk didn't work\n" ); goto put_fid; } - vfid =kmalloc (sizeof (struct v9fs_fid ),GFP_KERNEL ); -if (vfid ==NULL ) { -dprintk (DEBUG_ERROR ,"out of memory\n" ); - goto clunk_fid; - } - -/* TODO: do special things for O_EXCL, O_NOFOLLOW, O_SYNC */ -/* translate open mode appropriately */ +/* TODO: do special things for O_EXCL, O_NOFOLLOW, O_SYNC */ +/* translate open mode appropriately */ omode =v9fs_uflags2omode (file->f_flags); err =v9fs_t_open (v9ses, fid, omode, &fcall);if (err <0 ) {PRINT_FCALL_ERROR ("open failed" , fcall); - goto destroy_vfid; + goto clunk_fid; + } + + vfid =kmalloc (sizeof (struct v9fs_fid ),GFP_KERNEL ); +if (vfid ==NULL ) { +dprintk (DEBUG_ERROR ,"out of memory\n" ); + err = -ENOMEM ; + goto clunk_fid; } file->private_data = vfid;
@@ -106,15 +107,12 @@ int v9fs_file_open(struct inode *inode,return 0 ; -destroy_vfid: -v9fs_fid_destroy (vfid); - clunk_fid:v9fs_t_clunk (v9ses, fid); put_fid:v9fs_put_idpool (fid, &v9ses->fidpool); -kfree (fcall); +kfree (fcall);return err; }
fs/9p/vfs_inode.c +19 -28
127 lines not on this page · raw message
Signature · 1 line
1.1.0