From patchwork Sat Mar 5 17:52:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 85540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3CF38B70DC for ; Sun, 6 Mar 2011 04:54:10 +1100 (EST) Received: from localhost ([127.0.0.1]:54158 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pvvfq-0000xl-Gf for incoming@patchwork.ozlabs.org; Sat, 05 Mar 2011 12:53:50 -0500 Received: from [140.186.70.92] (port=38510 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvveW-0000ve-MZ for qemu-devel@nongnu.org; Sat, 05 Mar 2011 12:52:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PvveV-0003q1-FN for qemu-devel@nongnu.org; Sat, 05 Mar 2011 12:52:28 -0500 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:35439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PvveU-0003pR-UO for qemu-devel@nongnu.org; Sat, 05 Mar 2011 12:52:27 -0500 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id p25HqP3K011498 for ; Sun, 6 Mar 2011 04:52:25 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p25HqPpc2535522 for ; Sun, 6 Mar 2011 04:52:25 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p25HqPju019467 for ; Sun, 6 Mar 2011 04:52:25 +1100 Received: from skywalker.ibm.com ([9.124.94.223]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p25HqGsJ019428; Sun, 6 Mar 2011 04:52:23 +1100 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Sat, 5 Mar 2011 23:22:10 +0530 Message-Id: <1299347533-17047-5-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1299347533-17047-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1299347533-17047-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 202.81.31.140 Cc: aliguori@us.ibm.com, "Aneesh Kumar K.V" Subject: [Qemu-devel] [PATCH -V3 5/8] hw/9pfs: Add open flag to fid X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 56 +++++++++++++++++++++++++++++++++++++++++--------- hw/9pfs/virtio-9p.h | 1 + 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index ce09e55..1fa7256 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,28 @@ 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 + */ + if ((oflags & O_ACCMODE) != O_RDONLY) { + flags = O_RDWR; + } else { + flags = O_RDONLY; + } + /* + * 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; @@ -456,9 +480,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); } } /* @@ -1815,14 +1839,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; @@ -1941,11 +1970,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 +2688,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 b0f8210..10809ba 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;