Skip to contentSkip to conversation

contrib/vhost-user-blk: Replace lseek64 with lseek

PATCH In review Khem Raj 3 participants 3 messages Dec 18, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/1 contrib/vhost-user-blk: Replace lseek64 with lseek

64bit off_t is already in use since build uses _FILE_OFFSET_BITS=64 already. Using lseek/off_t also makes it work with latest musl without using _LARGEFILE64_SOURCE macro. This macro is implied with _GNU_SOURCE when using glibc but not with musl.

Cc Michael S. Tsirkin <[email protected]>
CC Raphael Norwitz <[email protected]>

---
v2: Fix typo must->musl

 contrib/vhost-user-blk/vhost-user-blk.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
contrib/vhost-user-blk/vhost-user-blk.c +2 -2
index aa99877fcd..7941694e53 100644
@@ -532,9 +532,9 @@ vub_get_blocksize(int fd)
 static void
 vub_initialize_config(int fd, struct virtio_blk_config *config)
 {
-    off64_t capacity;
+    off_t capacity;
 
-    capacity = lseek64(fd, 0, SEEK_END);
+    capacity = lseek(fd, 0, SEEK_END);
     config->capacity = capacity >> 9;
     config->blk_size = vub_get_blocksize(fd);
     config->size_max = 65536;
Signature · 1 line
2.39.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 20 lines · Khem Raj

64bit off_t is already in use since build uses _FILE_OFFSET_BITS=64 already. Using lseek/off_t also makes it work with latest musl without using _LARGEFILE64_SOURCE macro. This macro is implied with _GNU_SOURCE when using glibc but not with musl.

Cc Michael S. Tsirkin <[email protected]>
CC Raphael Norwitz <[email protected]>

---
v2: Fix typo must->musl

  contrib/vhost-user-blk/vhost-user-blk.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
contrib/vhost-user-blk/vhost-user-blk.c +0 -0
index aa99877fcd..7941694e53 100644
@@ -532,9 +532,9 @@ vub_get_blocksize(int fd)
  static void

contrib/vhost-user-blk/vhost-user-blk.c vub_get_blocksize(int fd) · line 540

Quoted 10 lines
contrib/vhost-user-blk/vhost-user-blk.c +2 -2
  vub_initialize_config(int fd, struct virtio_blk_config *config)
  {
-    off64_t capacity;
+    off_t capacity;
 
-    capacity = lseek64(fd, 0, SEEK_END);
+    capacity = lseek(fd, 0, SEEK_END);
      config->capacity = capacity >> 9;
      config->blk_size = vub_get_blocksize(fd);
      config->size_max = 65536;
Reviewed-by on v2 1/1
#2 lore raw
In reply to Khem Raj
Quoted 37 lines · Khem Raj

64bit off_t is already in use since build uses _FILE_OFFSET_BITS=64 already. Using lseek/off_t also makes it work with latest musl without using _LARGEFILE64_SOURCE macro. This macro is implied with _GNU_SOURCE when using glibc but not with musl.

Cc Michael S. Tsirkin <[email protected]>
CC Raphael Norwitz <[email protected]>

---
v2: Fix typo must->musl

contrib/vhost-user-blk/vhost-user-blk.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
contrib/vhost-user-blk/vhost-user-blk.c +0 -0
index aa99877fcd..7941694e53 100644
@@ -532,9 +532,9 @@ vub_get_blocksize(int fd)

static void
vub_initialize_config(int fd, struct virtio_blk_config *config) {

contrib/vhost-user-blk/vhost-user-blk.c +2 -2
-    off64_t capacity;
+    off_t capacity;
 
-    capacity = lseek64(fd, 0, SEEK_END);
+    capacity = lseek(fd, 0, SEEK_END);
    config->capacity = capacity >> 9;
    config->blk_size = vub_get_blocksize(fd);
    config->size_max = 65536;
Signature · 1 line
2.39.0