Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 23551
b: refs/heads/master
c: 16cce6d
h: refs/heads/master
i:
  23549: 114bb5b
  23547: 388ffb0
  23543: 9730f10
  23535: addacec
  23519: 85c3b4d
  23487: 7cdac02
  23423: ffd4903
  23295: 5aa4f19
  23039: 54509ae
  22527: 39c72ef
v: v3
  • Loading branch information
Latchesar Ionkov authored and Linus Torvalds committed Mar 25, 2006
1 parent be610d5 commit b06c5ba
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 52 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5174fdab9f58181249debab6e959ae4fd4abd0ed
refs/heads/master: 16cce6d27ef52e00cc124196046bbae7150024c1
8 changes: 5 additions & 3 deletions trunk/fs/9p/9p.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,16 +334,18 @@ v9fs_t_remove(struct v9fs_session_info *v9ses, u32 fid,
*/

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;

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);
Expand Down
3 changes: 2 additions & 1 deletion trunk/fs/9p/9p.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ struct Tcreate {
struct v9fs_str name;
u32 perm;
u8 mode;
struct v9fs_str extension;
};

struct Rcreate {
Expand Down Expand Up @@ -364,7 +365,7 @@ int 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);
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);
Expand Down
8 changes: 7 additions & 1 deletion trunk/fs/9p/conv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,14 +666,18 @@ struct v9fs_fcall *v9fs_create_topen(u32 fid, u8 mode)
return 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;
struct cbuf buffer;
struct 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;
Expand All @@ -682,6 +686,8 @@ struct v9fs_fcall *v9fs_create_tcreate(u32 fid, char *name, u32 perm, u8 mode)
v9fs_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);
Expand Down
3 changes: 2 additions & 1 deletion trunk/fs/9p/conv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ struct v9fs_fcall *v9fs_create_tflush(u16 oldtag);
struct 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);
Expand Down
32 changes: 15 additions & 17 deletions trunk/fs/9p/vfs_file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,29 +69,30 @@ int v9fs_file_open(struct inode *inode, struct file *file)

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;
Expand All @@ -106,15 +107,12 @@ int v9fs_file_open(struct inode *inode, struct file *file)

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;
}
Expand Down
47 changes: 19 additions & 28 deletions trunk/fs/9p/vfs_inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ struct inode *v9fs_get_inode(struct super_block *sb, int mode)
}

static int
v9fs_create(struct v9fs_session_info *v9ses, u32 pfid, char *name,
u32 perm, u8 mode, u32 *fidp, struct v9fs_qid *qid, u32 *iounit)
v9fs_create(struct v9fs_session_info *v9ses, u32 pfid, char *name, u32 perm,
u8 mode, char *extension, u32 *fidp, struct v9fs_qid *qid, u32 *iounit)
{
u32 fid;
int err;
Expand All @@ -271,14 +271,14 @@ v9fs_create(struct v9fs_session_info *v9ses, u32 pfid, char *name,
err = v9fs_t_walk(v9ses, pfid, fid, NULL, &fcall);
if (err < 0) {
PRINT_FCALL_ERROR("clone error", fcall);
goto error;
goto put_fid;
}
kfree(fcall);

err = v9fs_t_create(v9ses, fid, name, perm, mode, &fcall);
err = v9fs_t_create(v9ses, fid, name, perm, mode, extension, &fcall);
if (err < 0) {
PRINT_FCALL_ERROR("create fails", fcall);
goto error;
goto clunk_fid;
}

if (iounit)
Expand All @@ -293,7 +293,11 @@ v9fs_create(struct v9fs_session_info *v9ses, u32 pfid, char *name,
kfree(fcall);
return 0;

error:
clunk_fid:
v9fs_t_clunk(v9ses, fid);
fid = V9FS_NOFID;

put_fid:
if (fid >= 0)
v9fs_put_idpool(fid, &v9ses->fidpool);

Expand Down Expand Up @@ -474,7 +478,7 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode,
flags = O_RDWR;

err = v9fs_create(v9ses, dfid->fid, (char *) dentry->d_name.name,
perm, v9fs_uflags2omode(flags), &fid, &qid, &iounit);
perm, v9fs_uflags2omode(flags), NULL, &fid, &qid, &iounit);

if (err)
goto error;
Expand Down Expand Up @@ -550,7 +554,7 @@ static int v9fs_vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
perm = unixmode2p9mode(v9ses, mode | S_IFDIR);

err = v9fs_create(v9ses, dfid->fid, (char *) dentry->d_name.name,
perm, V9FS_OREAD, &fid, NULL, NULL);
perm, V9FS_OREAD, NULL, &fid, NULL, NULL);

if (err) {
dprintk(DEBUG_ERROR, "create error %d\n", err);
Expand Down Expand Up @@ -1008,11 +1012,13 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen)

/* copy extension buffer into buffer */
if (fcall->params.rstat.stat.extension.len < buflen)
buflen = fcall->params.rstat.stat.extension.len;
buflen = fcall->params.rstat.stat.extension.len + 1;

memcpy(buffer, fcall->params.rstat.stat.extension.str, buflen - 1);
memmove(buffer, fcall->params.rstat.stat.extension.str, buflen - 1);
buffer[buflen-1] = 0;

dprintk(DEBUG_ERROR, "%s -> %.*s (%s)\n", dentry->d_name.name, fcall->params.rstat.stat.extension.len,
fcall->params.rstat.stat.extension.str, buffer);
retval = buflen;

FreeFcall:
Expand Down Expand Up @@ -1072,7 +1078,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
if (!link)
link = ERR_PTR(-ENOMEM);
else {
len = v9fs_readlink(dentry, link, strlen(link));
len = v9fs_readlink(dentry, link, PATH_MAX);

if (len < 0) {
__putname(link);
Expand Down Expand Up @@ -1109,10 +1115,7 @@ static int v9fs_vfs_mkspecial(struct inode *dir, struct dentry *dentry,
struct v9fs_session_info *v9ses;
struct v9fs_fid *dfid, *vfid;
struct inode *inode;
struct v9fs_fcall *fcall;
struct v9fs_wstat wstat;

fcall = NULL;
inode = NULL;
vfid = NULL;
v9ses = v9fs_inode2v9ses(dir);
Expand All @@ -1125,7 +1128,7 @@ static int v9fs_vfs_mkspecial(struct inode *dir, struct dentry *dentry,
}

err = v9fs_create(v9ses, dfid->fid, (char *) dentry->d_name.name,
perm, V9FS_OREAD, &fid, NULL, NULL);
perm, V9FS_OREAD, (char *) extension, &fid, NULL, NULL);

if (err)
goto error;
Expand All @@ -1148,23 +1151,11 @@ static int v9fs_vfs_mkspecial(struct inode *dir, struct dentry *dentry,
goto error;
}

/* issue a Twstat */
v9fs_blank_wstat(&wstat);
wstat.muid = v9ses->name;
wstat.extension = (char *) extension;
err = v9fs_t_wstat(v9ses, vfid->fid, &wstat, &fcall);
if (err < 0) {
PRINT_FCALL_ERROR("wstat error", fcall);
goto error;
}

kfree(fcall);
dentry->d_op = &v9fs_dentry_operations;
d_instantiate(dentry, inode);
return 0;

error:
kfree(fcall);
if (vfid)
v9fs_fid_destroy(vfid);

Expand Down Expand Up @@ -1224,7 +1215,7 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir,
}

name = __getname();
sprintf(name, "hardlink(%d)\n", oldfid->fid);
sprintf(name, "%d\n", oldfid->fid);
retval = v9fs_vfs_mkspecial(dir, dentry, V9FS_DMLINK, name);
__putname(name);

Expand Down

0 comments on commit b06c5ba

Please sign in to comment.