Patchwork Removing O_LARGEFILE from block layer

login
register
mail settings
Submitter Richa Marwaha
Date Sept. 28, 2012, 4:45 p.m.
Message ID <1348850735-21903-1-git-send-email-rmarwah@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/187899/
State New
Headers show

Comments

Richa Marwaha - Sept. 28, 2012, 4:45 p.m.
QEMU by default configures -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
so there is not need to mention O_LARGEFILE in the block layer.

Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
---
 block/raw-posix.c |    2 +-
 block/vdi.c       |    2 +-
 block/vmdk.c      |    6 +++---
 block/vvfat.c     |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
Eric Blake - Sept. 28, 2012, 8:22 p.m.
On 09/28/2012 10:45 AM, Richa Marwaha wrote:
> QEMU by default configures -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
> so there is not need to mention O_LARGEFILE in the block layer.
> 
> Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
> ---
>  block/raw-posix.c |    2 +-
>  block/vdi.c       |    2 +-
>  block/vmdk.c      |    6 +++---
>  block/vvfat.c     |    2 +-
>  4 files changed, 6 insertions(+), 6 deletions(-)

Yay - I've previously suggested this, so it's nice to see it fixed.

Reviewed-by: Eric Blake <eblake@redhat.com>

Patch

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 28d439f..43e3936 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -965,7 +965,7 @@  static int hdev_open(BlockDriverState *bs, const char *filename, int flags)
         if ( bsdPath[ 0 ] != '\0' ) {
             strcat(bsdPath,"s0");
             /* some CDs don't have a partition 0 */
-            fd = qemu_open(bsdPath, O_RDONLY | O_BINARY | O_LARGEFILE);
+            fd = qemu_open(bsdPath, O_RDONLY | O_BINARY);
             if (fd < 0) {
                 bsdPath[strlen(bsdPath)-1] = '1';
             } else {
diff --git a/block/vdi.c b/block/vdi.c
index f35b12e..c70b38b 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -659,7 +659,7 @@  static int vdi_create(const char *filename, QEMUOptionParameter *options)
     }
 
     fd = qemu_open(filename,
-                   O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE,
+                   O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
                    0644);
     if (fd < 0) {
         return -errno;
diff --git a/block/vmdk.c b/block/vmdk.c
index f2e861b..c673de3 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1252,7 +1252,7 @@  static int vmdk_create_extent(const char *filename, int64_t filesize,
     uint32_t tmp, magic, grains, gd_size, gt_size, gt_count;
 
     fd = qemu_open(filename,
-                   O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE,
+                   O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
                    0644);
     if (fd < 0) {
         return -errno;
@@ -1574,11 +1574,11 @@  static int vmdk_create(const char *filename, QEMUOptionParameter *options)
             total_size / (int64_t)(63 * 16 * 512));
     if (split || flat) {
         fd = qemu_open(filename,
-                       O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE,
+                       O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
                        0644);
     } else {
         fd = qemu_open(filename,
-                       O_WRONLY | O_BINARY | O_LARGEFILE,
+                       O_WRONLY | O_BINARY,
                        0644);
     }
     if (fd < 0) {
diff --git a/block/vvfat.c b/block/vvfat.c
index 59d3c5b..24cbc71 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -1162,7 +1162,7 @@  static int open_file(BDRVVVFATState* s,mapping_t* mapping)
     if(!s->current_mapping ||
 	    strcmp(s->current_mapping->path,mapping->path)) {
 	/* open file */
-	int fd = qemu_open(mapping->path, O_RDONLY | O_BINARY | O_LARGEFILE);
+	int fd = qemu_open(mapping->path, O_RDONLY | O_BINARY);
 	if(fd<0)
 	    return -1;
 	vvfat_close_current_file(s);