From ea60f31593cd7d16c6e557e8cf4caf1d1e1680b6 Mon Sep 17 00:00:00 2001 From: "M. Mohan Kumar" Date: Wed, 12 Oct 2011 19:11:24 +0530 Subject: [PATCH] virtio-9p: Use 9P specific Lock constants Use 9P specific lock constants instead of arch specific lock constants. Signed-off-by: M. Mohan Kumar Signed-off-by: Aneesh Kumar K.V --- hw/9pfs/virtio-9p.c | 2 +- hw/9pfs/virtio-9p.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 3958788248..d4764855d9 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -2930,7 +2930,7 @@ static void v9fs_getlock(void *opaque) if (err < 0) { goto out; } - glock->type = F_UNLCK; + glock->type = P9_LOCK_TYPE_UNLCK; offset += pdu_marshal(pdu, offset, "bqqds", glock->type, glock->start, glock->length, glock->proc_id, &glock->client_id); diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index 60b8a56e57..e5cf78c06a 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -352,6 +352,11 @@ typedef struct V9fsMkState { V9fsString fullname; } V9fsMkState; +/* 9P2000.L lock type */ +#define P9_LOCK_TYPE_RDLCK 0 +#define P9_LOCK_TYPE_WRLCK 1 +#define P9_LOCK_TYPE_UNLCK 2 + #define P9_LOCK_SUCCESS 0 #define P9_LOCK_BLOCKED 1 #define P9_LOCK_ERROR 2