Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/e2fsprogs-03-direct.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3187 ab2b12a5d309
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3187
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
     1
 
--- e2fsprogs-1.41.14/lib/ext2fs/unix_io.c	2010-12-22 16:49:20.000000000 +0100
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
     2
 
+++ e2fsprogs-1.41.14-patch/lib/ext2fs/unix_io.c	2011-02-08 07:38:01.204825180 +0100
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
     3
 
@@ -464,7 +464,7 @@
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
     4
 
 	if (flags & IO_FLAG_EXCLUSIVE)
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
     5
 
 		open_flags |= O_EXCL;
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
     6
 
 	if (flags & IO_FLAG_DIRECT_IO)
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
     7
 
-		open_flags |= O_DIRECT;
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
     8
 
+		open_flags |= O_DSYNC;
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
     9
 
 	data->flags = flags;
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
    10
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
    11
 
 #ifdef HAVE_OPEN64
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
    12
 
@@ -477,6 +477,8 @@
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
    13
 
 		goto cleanup;
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
    14
 
 	}
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
    15
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
    16
 
+	(void) directio(data->dev, DIRECTIO_ON);
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
    17
 
+
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
    18
 
 #ifdef BLKSSZGET
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
    19
 
 	if (flags & IO_FLAG_DIRECT_IO) {
ab2b12a5d309 SFEe2fsprogs.spec: bump to 1.41.14, replace O_DIRECT
jurikm
parents:
diff changeset 
    20
 
 		if (ioctl(data->dev, BLKSSZGET, &data->align) != 0)
upstream/spec-files-extra