diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-08 07:23:55 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-08 07:23:55 -0600 |
| commit | dc717bfd057ac3d6b75c633d57e501d5e6d5ef50 (patch) | |
| tree | fb693fceacd28b9ccc47fe64b925e32bc52298cc /hw/9pfs/virtio-9p.c | |
| parent | a283b1b8eb121dcc086c4850c91b35fed13d2023 (diff) | |
| parent | eed968607d656a218712df47a5e0432c21fd6994 (diff) | |
Merge remote-tracking branch 'aneesh/for-upstream' into staging
* aneesh/for-upstream:
hw/9pfs: Remove O_NOATIME flag from 9pfs open() calls in readonly mode
hw/9pfs: Update MAINTAINERS file
fsdev: Fix parameter parsing for proxy helper
hw/9pfs: Fix crash when mounting with synthfs
hw/9pfs: Preserve S_ISGID
hw/9pfs: Add new security model mapped-file.
Diffstat (limited to 'hw/9pfs/virtio-9p.c')
| -rw-r--r-- | hw/9pfs/virtio-9p.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index e6ba6ba30b..a72ffc3390 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -986,7 +986,7 @@ static void v9fs_attach(void *opaque) s->root_fid = fid; /* disable migration */ error_set(&s->migration_blocker, QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION, - s->ctx.fs_root, s->tag); + s->ctx.fs_root ? s->ctx.fs_root : "NULL", s->tag); migrate_add_blocker(s->migration_blocker); out: put_fid(pdu, fidp); @@ -1391,7 +1391,6 @@ static void v9fs_open(void *opaque) err = -EROFS; goto out; } - flags |= O_NOATIME; } err = v9fs_co_open(pdu, fidp, flags); if (err < 0) { |