[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v17 20/23] osdep: Fall back to posix lock when OFD l
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v17 20/23] osdep: Fall back to posix lock when OFD lock is unavailable |
Date: |
Wed, 3 May 2017 00:35:55 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
util/osdep.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/util/osdep.c b/util/osdep.c
index 3de4a18..a2863c8 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -38,6 +38,14 @@ extern int madvise(caddr_t, size_t, int);
#include "qemu/error-report.h"
#include "monitor/monitor.h"
+#ifdef F_OFD_SETLK
+#define QEMU_SETLK F_OFD_SETLK
+#define QEMU_GETLK F_OFD_GETLK
+#else
+#define QEMU_SETLK F_SETLK
+#define QEMU_GETLK F_GETLK
+#endif
+
static bool fips_enabled = false;
static const char *hw_version = QEMU_HW_VERSION;
@@ -143,7 +151,6 @@ static int qemu_parse_fdset(const char *param)
static int qemu_lock_fcntl(int fd, int64_t start, int64_t len, int fl_type)
{
-#ifdef F_OFD_SETLK
int ret;
struct flock fl = {
.l_whence = SEEK_SET,
@@ -151,11 +158,8 @@ static int qemu_lock_fcntl(int fd, int64_t start, int64_t
len, int fl_type)
.l_len = len,
.l_type = fl_type,
};
- ret = fcntl(fd, F_OFD_SETLK, &fl);
+ ret = fcntl(fd, QEMU_SETLK, &fl);
return ret == -1 ? -errno : 0;
-#else
- return -ENOTSUP;
-#endif
}
int qemu_lock_fd(int fd, int64_t start, int64_t len, bool exclusive)
@@ -170,7 +174,6 @@ int qemu_unlock_fd(int fd, int64_t start, int64_t len)
int qemu_lock_fd_test(int fd, int64_t start, int64_t len, bool exclusive)
{
-#ifdef F_OFD_SETLK
int ret;
struct flock fl = {
.l_whence = SEEK_SET,
@@ -178,15 +181,12 @@ int qemu_lock_fd_test(int fd, int64_t start, int64_t len,
bool exclusive)
.l_len = len,
.l_type = exclusive ? F_WRLCK : F_RDLCK,
};
- ret = fcntl(fd, F_OFD_GETLK, &fl);
+ ret = fcntl(fd, QEMU_GETLK, &fl);
if (ret == -1) {
return -errno;
} else {
return fl.l_type == F_UNLCK ? 0 : -EAGAIN;
}
-#else
- return -ENOTSUP;
-#endif
}
#endif
--
2.9.3
- [Qemu-block] [PATCH v17 10/23] iotests: 085: Avoid image locking conflict, (continued)
- [Qemu-block] [PATCH v17 10/23] iotests: 085: Avoid image locking conflict, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 12/23] iotests: 091: Quit QEMU before checking image, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 13/23] iotests: 172: Use separate images for multiple devices, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 14/23] tests: Use null-co:// instead of /dev/null as the dummy image, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 15/23] file-posix: Add 'locking' option, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 16/23] file-win32: Error out if locking=on, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 17/23] tests: Disable image lock in test-replication, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 18/23] block: Reuse bs as backing hd for drive-backup sync=none, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 19/23] osdep: Add qemu_lock_fd and qemu_unlock_fd, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 20/23] osdep: Fall back to posix lock when OFD lock is unavailable,
Fam Zheng <=
- [Qemu-block] [PATCH v17 21/23] file-posix: Add image locking to perm operations, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 23/23] tests: Add POSIX image locking test case 182, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 22/23] qemu-iotests: Add test case 153 for image locking, Fam Zheng, 2017/05/02
- Re: [Qemu-block] [PATCH v17 00/23] block: Image locking series, Kevin Wolf, 2017/05/04