Message ID | 1296929291-11047-3-git-send-email-aneesh.kumar@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
On 2/5/2011 10:08 AM, Aneesh Kumar K.V wrote: > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > --- > hw/9pfs/virtio-9p.c | 31 +++++++++++++++++++++++++++++++ > hw/9pfs/virtio-9p.h | 2 ++ > 2 files changed, 33 insertions(+), 0 deletions(-) > > diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c > index 2d9ca11..1518e00 100644 > --- a/hw/9pfs/virtio-9p.c > +++ b/hw/9pfs/virtio-9p.c > @@ -1978,6 +1978,36 @@ static void v9fs_fsync(V9fsState *s, V9fsPDU *pdu) > v9fs_post_do_fsync(s, pdu, err); > } > > +static void v9fs_post_do_syncfs(V9fsState *s, V9fsPDU *pdu, int err) > +{ > + if (err == -1) { > + err = -errno; > + } > + complete_pdu(s, pdu, err); > +} > + > +static void v9fs_syncfs(V9fsState *s, V9fsPDU *pdu) > +{ > + int err; > + int32_t fid; > + size_t offset = 7; > + V9fsFidState *fidp; > + > + pdu_unmarshal(pdu, offset, "d", &fid); > + fidp = lookup_fid(s, fid); > + if (fidp == NULL) { > + err = -ENOENT; > + v9fs_post_do_syncfs(s, pdu, err); > + return; > + } > + /* > + * We don't have per file system syncfs > + * So just return success > + */ > + err = 0; How about err = 0 if (fidp == NULL) err = -ENOENT > + v9fs_post_do_syncfs(s, pdu, err); > +} > + > static void v9fs_clunk(V9fsState *s, V9fsPDU *pdu) > { > int32_t fid; > @@ -3676,6 +3706,7 @@ static pdu_handler_t *pdu_handlers[] = { > [P9_TWALK] = v9fs_walk, > [P9_TCLUNK] = v9fs_clunk, > [P9_TFSYNC] = v9fs_fsync, > + [P9_TSYNCFS] = v9fs_syncfs, > [P9_TOPEN] = v9fs_open, > [P9_TREAD] = v9fs_read, > #if 0 > diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h > index 82b4252..b2cd24b 100644 > --- a/hw/9pfs/virtio-9p.h > +++ b/hw/9pfs/virtio-9p.h > @@ -13,6 +13,8 @@ > #define VIRTIO_9P_MOUNT_TAG 0 > > enum { > + P9_TSYNCFS = 0, > + P9_RSYNCFS, > P9_TLERROR = 6, > P9_RLERROR, > P9_TSTATFS = 8,
On Mon, 28 Feb 2011 17:48:34 -0800, "Venkateswararao Jujjuri (JV)" <jvrao@linux.vnet.ibm.com> wrote: > On 2/5/2011 10:08 AM, Aneesh Kumar K.V wrote: > > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > > --- > > hw/9pfs/virtio-9p.c | 31 +++++++++++++++++++++++++++++++ > > hw/9pfs/virtio-9p.h | 2 ++ > > 2 files changed, 33 insertions(+), 0 deletions(-) > > > > diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c > > index 2d9ca11..1518e00 100644 > > --- a/hw/9pfs/virtio-9p.c > > +++ b/hw/9pfs/virtio-9p.c > > @@ -1978,6 +1978,36 @@ static void v9fs_fsync(V9fsState *s, V9fsPDU *pdu) > > v9fs_post_do_fsync(s, pdu, err); > > } > > > > +static void v9fs_post_do_syncfs(V9fsState *s, V9fsPDU *pdu, int err) > > +{ > > + if (err == -1) { > > + err = -errno; > > + } > > + complete_pdu(s, pdu, err); > > +} > > + > > +static void v9fs_syncfs(V9fsState *s, V9fsPDU *pdu) > > +{ > > + int err; > > + int32_t fid; > > + size_t offset = 7; > > + V9fsFidState *fidp; > > + > > + pdu_unmarshal(pdu, offset, "d", &fid); > > + fidp = lookup_fid(s, fid); > > + if (fidp == NULL) { > > + err = -ENOENT; > > + v9fs_post_do_syncfs(s, pdu, err); > > + return; > > + } > > + /* > > + * We don't have per file system syncfs > > + * So just return success > > + */ > > + err = 0; > > How about > > err = 0 > if (fidp == NULL) > err = -ENOENT > That err = 0 will go away once we get the below support in the kernel. http://thread.gmane.org/gmane.linux.file-systems/44628 -aneesh
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 2d9ca11..1518e00 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -1978,6 +1978,36 @@ static void v9fs_fsync(V9fsState *s, V9fsPDU *pdu) v9fs_post_do_fsync(s, pdu, err); } +static void v9fs_post_do_syncfs(V9fsState *s, V9fsPDU *pdu, int err) +{ + if (err == -1) { + err = -errno; + } + complete_pdu(s, pdu, err); +} + +static void v9fs_syncfs(V9fsState *s, V9fsPDU *pdu) +{ + int err; + int32_t fid; + size_t offset = 7; + V9fsFidState *fidp; + + pdu_unmarshal(pdu, offset, "d", &fid); + fidp = lookup_fid(s, fid); + if (fidp == NULL) { + err = -ENOENT; + v9fs_post_do_syncfs(s, pdu, err); + return; + } + /* + * We don't have per file system syncfs + * So just return success + */ + err = 0; + v9fs_post_do_syncfs(s, pdu, err); +} + static void v9fs_clunk(V9fsState *s, V9fsPDU *pdu) { int32_t fid; @@ -3676,6 +3706,7 @@ static pdu_handler_t *pdu_handlers[] = { [P9_TWALK] = v9fs_walk, [P9_TCLUNK] = v9fs_clunk, [P9_TFSYNC] = v9fs_fsync, + [P9_TSYNCFS] = v9fs_syncfs, [P9_TOPEN] = v9fs_open, [P9_TREAD] = v9fs_read, #if 0 diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index 82b4252..b2cd24b 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -13,6 +13,8 @@ #define VIRTIO_9P_MOUNT_TAG 0 enum { + P9_TSYNCFS = 0, + P9_RSYNCFS, P9_TLERROR = 6, P9_RLERROR, P9_TSTATFS = 8,
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> --- hw/9pfs/virtio-9p.c | 31 +++++++++++++++++++++++++++++++ hw/9pfs/virtio-9p.h | 2 ++ 2 files changed, 33 insertions(+), 0 deletions(-)