From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39228 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PuJEx-0007cw-89 for qemu-devel@nongnu.org; Tue, 01 Mar 2011 01:39:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PuJEu-00035s-J5 for qemu-devel@nongnu.org; Tue, 01 Mar 2011 01:39:22 -0500 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:38571) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PuJEu-00035Q-0S for qemu-devel@nongnu.org; Tue, 01 Mar 2011 01:39:20 -0500 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp03.au.ibm.com (8.14.4/8.13.1) with ESMTP id p216Yb4h001783 for ; Tue, 1 Mar 2011 17:34:37 +1100 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p216dCZs1900652 for ; Tue, 1 Mar 2011 17:39:12 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p216dBn8025759 for ; Tue, 1 Mar 2011 17:39:11 +1100 From: "Aneesh Kumar K.V" Date: Tue, 1 Mar 2011 12:08:53 +0530 Message-Id: <1298961534-8099-5-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1298961534-8099-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1298961534-8099-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH -V2 5/6] hw/9pfs: Add open flag to fid List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, "Aneesh Kumar K.V" We use this flag when we reopen the file. We need to track open flag because if the open request have flags like O_SYNC, we want to open the file with same flag in host too Signed-off-by: Aneesh Kumar K.V --- hw/9pfs/virtio-9p.c | 52 +++++++++++++++++++++++++++++++++++++++++--------- hw/9pfs/virtio-9p.h | 1 + 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 882f4f3..a4c5905 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -22,6 +22,8 @@ int debug_9p_pdu; static void v9fs_reclaim_fd(V9fsState *s); +#define PASS_OPEN_FLAG (O_SYNC | O_DSYNC | O_RSYNC | \ + O_EXCL) enum { Oread = 0x00, Owrite = 0x01, @@ -68,6 +70,24 @@ static int omode_to_uflags(int8_t mode) return ret; } +static int get_dotl_openflags(int oflags) +{ + int flags; + /* + * Since we can share the fd between multiple fids, + * open the file in read write mode + */ + flags = O_RDWR; + /* + * If the client asked for any of the below flags we + * should open the file with same open flag + */ + if (oflags & PASS_OPEN_FLAG) { + flags |= oflags & PASS_OPEN_FLAG; + } + return flags; +} + void cred_init(FsCred *credp) { credp->fc_uid = -1; @@ -452,9 +472,9 @@ static V9fsFidState *lookup_fid(V9fsState *s, int32_t fid) * descriptors. */ if (f->fsmap.fid_type == P9_FID_FILE) { - /* FIXME!! should we remember the open flags ?*/ if (f->fsmap.fs.fd == -1) { - f->fsmap.fs.fd = v9fs_do_open(s, &f->fsmap.path, O_RDWR); + f->fsmap.fs.fd = v9fs_do_open(s, &f->fsmap.path, + f->fsmap.open_flags); } } /* @@ -1811,14 +1831,19 @@ static void v9fs_open_post_lstat(V9fsState *s, V9fsOpenState *vs, int err) v9fs_open_post_opendir(s, vs, err); } else { if (s->proto_version == V9FS_PROTO_2000L) { - flags = vs->mode; - flags &= ~(O_NOCTTY | O_ASYNC | O_CREAT); - /* Ignore direct disk access hint until the server supports it. */ - flags &= ~O_DIRECT; + flags = get_dotl_openflags(vs->mode); } else { flags = omode_to_uflags(vs->mode); } vs->fidp->fsmap.fs.fd = v9fs_do_open(s, &vs->fidp->fsmap.path, flags); + vs->fidp->fsmap.open_flags = flags; + if (flags & O_EXCL) { + /* + * We let the host file system do O_EXCL check + * We should not reclaim such fd + */ + vs->fidp->fsmap.flags |= FID_NON_RECLAIMABLE; + } v9fs_open_post_open(s, vs, err); } return; @@ -1937,11 +1962,17 @@ static void v9fs_lcreate(V9fsState *s, V9fsPDU *pdu) v9fs_string_sprintf(&vs->fullname, "%s/%s", vs->fidp->fsmap.path.data, vs->name.data); - /* Ignore direct disk access hint until the server supports it. */ - flags &= ~O_DIRECT; - + flags = get_dotl_openflags(flags); vs->fidp->fsmap.fs.fd = v9fs_do_open2(s, vs->fullname.data, vs->fidp->uid, - gid, flags, mode); + gid, flags | O_CREAT, mode); + vs->fidp->fsmap.open_flags = flags; + if (flags & O_EXCL) { + /* + * We let the host file system do O_EXCL check + * We should not reclaim such fd + */ + vs->fidp->fsmap.flags |= FID_NON_RECLAIMABLE; + } v9fs_lcreate_post_do_open2(s, vs, err); return; @@ -2653,6 +2684,7 @@ static void v9fs_create_post_lstat(V9fsState *s, V9fsCreateState *vs, int err) -1, omode_to_uflags(vs->mode)|O_CREAT, vs->perm); + vs->fidp->fsmap.open_flags = omode_to_uflags(vs->mode); v9fs_create_post_open2(s, vs, err); } diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index 23c14d8..ca6bded 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -196,6 +196,7 @@ typedef struct V9fsfidmap { DIR *dir; V9fsXattr xattr; } fs; + int open_flags; int fid_type; V9fsString path; int flags; -- 1.7.1