提交 c7b4b0b3 编写于 作者: M M. Mohan Kumar 提交者: Aneesh Kumar K.V

rename - change name of file or directory

size[4] Trename tag[2] fid[4] newdirfid[4] name[s]
size[4] Rrename tag[2]

Implement the 2000.L rename operation. A new function
v9fs_complete_rename is introduced that acts as a common entry point
for 2000.L rename operation and 2000.U rename opearation (via wstat).
As part of this change the field 'nname' (used only for rename) is
removed from the structure V9fsWstatState. Instead a new structure
V9fsRenameState is used for rename operations both by 2000.U and 2000.L
code paths. Both 2000.U and 2000.L rename code paths construct the
V9fsRenameState structure and passes that to v9fs_complete_rename
function.

Changes from previous version:
 Use qemu_mallocz to initialize
 Use strcpy,strcat functions instead of memcpy
 Changed the variable name to newdirfid
 Introduced post rename function
 Error checking
 Removed nname field from V9fsWstatState
Signed-off-by: NM. Mohan Kumar <mohan@in.ibm.com>
Signed-off-by: NVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
上级 b67592ea
...@@ -2563,11 +2563,6 @@ static void v9fs_wstat_post_rename(V9fsState *s, V9fsWstatState *vs, int err) ...@@ -2563,11 +2563,6 @@ static void v9fs_wstat_post_rename(V9fsState *s, V9fsWstatState *vs, int err)
if (err < 0) { if (err < 0) {
goto out; goto out;
} }
if (vs->v9stat.name.size != 0) {
v9fs_string_free(&vs->nname);
}
if (vs->v9stat.length != -1) { if (vs->v9stat.length != -1) {
if (v9fs_do_truncate(s, &vs->fidp->path, vs->v9stat.length) < 0) { if (v9fs_do_truncate(s, &vs->fidp->path, vs->v9stat.length) < 0) {
err = -errno; err = -errno;
...@@ -2582,17 +2577,30 @@ out: ...@@ -2582,17 +2577,30 @@ out:
qemu_free(vs); qemu_free(vs);
} }
static void v9fs_wstat_post_chown(V9fsState *s, V9fsWstatState *vs, int err) static int v9fs_complete_rename(V9fsState *s, V9fsRenameState *vs)
{ {
V9fsFidState *fidp; int err = 0;
if (err < 0) { char *old_name, *new_name;
goto out; char *end;
}
if (vs->v9stat.name.size != 0) { if (vs->newdirfid != -1) {
char *old_name, *new_name; V9fsFidState *dirfidp;
char *end; dirfidp = lookup_fid(s, vs->newdirfid);
if (dirfidp == NULL) {
err = -ENOENT;
goto out;
}
BUG_ON(dirfidp->fd != -1);
BUG_ON(dirfidp->dir);
new_name = qemu_mallocz(dirfidp->path.size + vs->name.size + 2);
strcpy(new_name, dirfidp->path.data);
strcat(new_name, "/");
strcat(new_name + dirfidp->path.size, vs->name.data);
} else {
old_name = vs->fidp->path.data; old_name = vs->fidp->path.data;
end = strrchr(old_name, '/'); end = strrchr(old_name, '/');
if (end) { if (end) {
...@@ -2600,43 +2608,75 @@ static void v9fs_wstat_post_chown(V9fsState *s, V9fsWstatState *vs, int err) ...@@ -2600,43 +2608,75 @@ static void v9fs_wstat_post_chown(V9fsState *s, V9fsWstatState *vs, int err)
} else { } else {
end = old_name; end = old_name;
} }
new_name = qemu_mallocz(end - old_name + vs->name.size + 1);
new_name = qemu_mallocz(end - old_name + vs->v9stat.name.size + 1); strncat(new_name, old_name, end - old_name);
strncat(new_name + (end - old_name), vs->name.data, vs->name.size);
}
memcpy(new_name, old_name, end - old_name); v9fs_string_free(&vs->name);
memcpy(new_name + (end - old_name), vs->v9stat.name.data, vs->name.data = qemu_strdup(new_name);
vs->v9stat.name.size); vs->name.size = strlen(new_name);
vs->nname.data = new_name;
vs->nname.size = strlen(new_name);
if (strcmp(new_name, vs->fidp->path.data) != 0) { if (strcmp(new_name, vs->fidp->path.data) != 0) {
if (v9fs_do_rename(s, &vs->fidp->path, &vs->nname)) { if (v9fs_do_rename(s, &vs->fidp->path, &vs->name)) {
err = -errno; err = -errno;
} else { } else {
/* V9fsFidState *fidp;
* Fixup fid's pointing to the old name to /*
* start pointing to the new name * Fixup fid's pointing to the old name to
*/ * start pointing to the new name
for (fidp = s->fid_list; fidp; fidp = fidp->next) { */
for (fidp = s->fid_list; fidp; fidp = fidp->next) {
if (vs->fidp == fidp) { if (vs->fidp == fidp) {
/* /*
* we replace name of this fid towards the end * we replace name of this fid towards the end
* so that our below strcmp will work * so that our below strcmp will work
*/ */
continue; continue;
} }
if (!strncmp(vs->fidp->path.data, fidp->path.data, if (!strncmp(vs->fidp->path.data, fidp->path.data,
strlen(vs->fidp->path.data))) { strlen(vs->fidp->path.data))) {
/* replace the name */ /* replace the name */
v9fs_fix_path(&fidp->path, &vs->nname, v9fs_fix_path(&fidp->path, &vs->name,
strlen(vs->fidp->path.data)); strlen(vs->fidp->path.data));
}
} }
v9fs_string_copy(&vs->fidp->path, &vs->nname);
} }
v9fs_string_copy(&vs->fidp->path, &vs->name);
} }
} }
out:
v9fs_string_free(&vs->name);
return err;
}
static void v9fs_rename_post_rename(V9fsState *s, V9fsRenameState *vs, int err)
{
complete_pdu(s, vs->pdu, err);
qemu_free(vs);
}
static void v9fs_wstat_post_chown(V9fsState *s, V9fsWstatState *vs, int err)
{
if (err < 0) {
goto out;
}
if (vs->v9stat.name.size != 0) {
V9fsRenameState *vr;
vr = qemu_malloc(sizeof(V9fsRenameState));
memset(vr, sizeof(*vr), 0);
vr->newdirfid = -1;
vr->pdu = vs->pdu;
vr->fidp = vs->fidp;
vr->offset = vs->offset;
vr->name.size = vs->v9stat.name.size;
vr->name.data = qemu_strdup(vs->v9stat.name.data);
err = v9fs_complete_rename(s, vr);
qemu_free(vr);
}
v9fs_wstat_post_rename(s, vs, err); v9fs_wstat_post_rename(s, vs, err);
return; return;
...@@ -2646,6 +2686,35 @@ out: ...@@ -2646,6 +2686,35 @@ out:
qemu_free(vs); qemu_free(vs);
} }
static void v9fs_rename(V9fsState *s, V9fsPDU *pdu)
{
int32_t fid;
V9fsRenameState *vs;
ssize_t err = 0;
vs = qemu_malloc(sizeof(*vs));
vs->pdu = pdu;
vs->offset = 7;
pdu_unmarshal(vs->pdu, vs->offset, "dds", &fid, &vs->newdirfid, &vs->name);
vs->fidp = lookup_fid(s, fid);
if (vs->fidp == NULL) {
err = -ENOENT;
goto out;
}
BUG_ON(vs->fidp->fd != -1);
BUG_ON(vs->fidp->dir);
err = v9fs_complete_rename(s, vs);
v9fs_rename_post_rename(s, vs, err);
return;
out:
complete_pdu(s, vs->pdu, err);
qemu_free(vs);
}
static void v9fs_wstat_post_utime(V9fsState *s, V9fsWstatState *vs, int err) static void v9fs_wstat_post_utime(V9fsState *s, V9fsWstatState *vs, int err)
{ {
if (err < 0) { if (err < 0) {
...@@ -3004,6 +3073,7 @@ static pdu_handler_t *pdu_handlers[] = { ...@@ -3004,6 +3073,7 @@ static pdu_handler_t *pdu_handlers[] = {
[P9_TGETATTR] = v9fs_getattr, [P9_TGETATTR] = v9fs_getattr,
[P9_TSETATTR] = v9fs_setattr, [P9_TSETATTR] = v9fs_setattr,
[P9_TMKNOD] = v9fs_mknod, [P9_TMKNOD] = v9fs_mknod,
[P9_TRENAME] = v9fs_rename,
[P9_TMKDIR] = v9fs_mkdir, [P9_TMKDIR] = v9fs_mkdir,
[P9_TVERSION] = v9fs_version, [P9_TVERSION] = v9fs_version,
[P9_TATTACH] = v9fs_attach, [P9_TATTACH] = v9fs_attach,
......
...@@ -21,6 +21,8 @@ enum { ...@@ -21,6 +21,8 @@ enum {
P9_RSYMLINK, P9_RSYMLINK,
P9_TMKNOD = 18, P9_TMKNOD = 18,
P9_RMKNOD, P9_RMKNOD,
P9_TRENAME = 20,
P9_RRENAME,
P9_TGETATTR = 24, P9_TGETATTR = 24,
P9_RGETATTR, P9_RGETATTR,
P9_TSETATTR = 26, P9_TSETATTR = 26,
...@@ -310,7 +312,6 @@ typedef struct V9fsWstatState ...@@ -310,7 +312,6 @@ typedef struct V9fsWstatState
V9fsStat v9stat; V9fsStat v9stat;
V9fsFidState *fidp; V9fsFidState *fidp;
struct stat stbuf; struct stat stbuf;
V9fsString nname;
} V9fsWstatState; } V9fsWstatState;
typedef struct V9fsSymlinkState typedef struct V9fsSymlinkState
...@@ -385,6 +386,14 @@ typedef struct V9fsMkState { ...@@ -385,6 +386,14 @@ typedef struct V9fsMkState {
V9fsString fullname; V9fsString fullname;
} V9fsMkState; } V9fsMkState;
typedef struct V9fsRenameState {
V9fsPDU *pdu;
V9fsFidState *fidp;
size_t offset;
int32_t newdirfid;
V9fsString name;
} V9fsRenameState;
extern size_t pdu_packunpack(void *addr, struct iovec *sg, int sg_count, extern size_t pdu_packunpack(void *addr, struct iovec *sg, int sg_count,
size_t offset, size_t size, int pack); size_t offset, size_t size, int pack);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册