ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-9p: Do not reset atime 

Current code resets file's atime to 0 when there is a change in mtime.
    This results in resetting the atime to "1970-01-01 05:30:00". For
    example, truncate -s 0 filename results in changing the mtime to the
    truncate time, but resets the atime to "1970-01-01 05:30:00". utime
    system call does not have any provision to set only mtime or atime. So
    change v9fs_wstat_post_chmod function to use utimensat function to change
    the atime and mtime fields. If tv_nsec field is set to the special value
    "UTIME_OMIT", corresponding file time stamp is not updated.

Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com>
Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
This commit is contained in:
M. Mohan Kumar 2010-06-09 19:14:38 +05:30 committed by Aneesh Kumar K.V
parent 00ede4c252
commit 74bc02b2d2
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/file-op-9p.h
View File

@ -52,7 +52,7 @@ typedef struct FileOperations
int (*chmod)(FsContext *, const char *, FsCred *); int (*chmod)(FsContext *, const char *, FsCred *);
int (*chown)(FsContext *, const char *, FsCred *); int (*chown)(FsContext *, const char *, FsCred *);
int (*mknod)(FsContext *, const char *, FsCred *); int (*mknod)(FsContext *, const char *, FsCred *);
int (*utime)(FsContext *, const char *, const struct utimbuf *); int (*utimensat)(FsContext *, const char *, const struct timespec *);
int (*remove)(FsContext *, const char *); int (*remove)(FsContext *, const char *);
int (*symlink)(FsContext *, const char *, const char *, FsCred *); int (*symlink)(FsContext *, const char *, const char *, FsCred *);
int (*link)(FsContext *, const char *, const char *); int (*link)(FsContext *, const char *, const char *);

8
hw/virtio-9p-local.c
View File

@ -450,10 +450,10 @@ static int local_chown(FsContext *fs_ctx, const char *path, FsCred *credp)
return -1; return -1;
} }
static int local_utime(FsContext *ctx, const char *path, static int local_utimensat(FsContext *s, const char *path,
const struct utimbuf *buf) const struct timespec *buf)
{ {
return utime(rpath(ctx, path), buf); return utimensat(AT_FDCWD, rpath(s, path), buf, AT_SYMLINK_NOFOLLOW);
} }
static int local_remove(FsContext *ctx, const char *path) static int local_remove(FsContext *ctx, const char *path)
@ -495,7 +495,7 @@ FileOperations local_ops = {
.truncate = local_truncate, .truncate = local_truncate,
.rename = local_rename, .rename = local_rename,
.chown = local_chown, .chown = local_chown,
.utime = local_utime, .utimensat = local_utimensat,
.remove = local_remove, .remove = local_remove,
.fsync = local_fsync, .fsync = local_fsync,
.statfs = local_statfs, .statfs = local_statfs,

28
hw/virtio-9p.c
View File

@ -237,10 +237,25 @@ static int v9fs_do_chown(V9fsState *s, V9fsString *path, uid_t uid, gid_t gid)
return s->ops->chown(&s->ctx, path->data, &cred); return s->ops->chown(&s->ctx, path->data, &cred);
} }
static int v9fs_do_utime(V9fsState *s, V9fsString *path, static int v9fs_do_utimensat(V9fsState *s, V9fsString *path, V9fsStat v9stat)
const struct utimbuf *buf)
{ {
return s->ops->utime(&s->ctx, path->data, buf); struct timespec ts[2];
if (v9stat.atime != -1) {
ts[0].tv_sec = v9stat.atime;
ts[0].tv_nsec = 0;
} else {
ts[0].tv_nsec = UTIME_OMIT;
}
if (v9stat.mtime != -1) {
ts[1].tv_sec = v9stat.mtime;
ts[1].tv_nsec = 0;
} else {
ts[1].tv_nsec = UTIME_OMIT;
}
return s->ops->utimensat(&s->ctx, path->data, ts);
} }
static int v9fs_do_remove(V9fsState *s, V9fsString *path) static int v9fs_do_remove(V9fsState *s, V9fsString *path)
@ -2325,11 +2340,8 @@ static void v9fs_wstat_post_chmod(V9fsState *s, V9fsWstatState *vs, int err)
goto out; goto out;
} }
if (vs->v9stat.mtime != -1) { if (vs->v9stat.mtime != -1 || vs->v9stat.atime != -1) {
struct utimbuf tb; if (v9fs_do_utimensat(s, &vs->fidp->path, vs->v9stat)) {
tb.actime = 0;
tb.modtime = vs->v9stat.mtime;
if (v9fs_do_utime(s, &vs->fidp->path, &tb)) {
err = -errno; err = -errno;
} }
} }