Whamcloud - gitweb
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ext2fs: add readahead method to improve scanning
[tools/e2fsprogs.git] / lib / ext2fs / unix_io.c
diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
index 9f0613a..eb8e359 100644 (file)
--- a/lib/ext2fs/unix_io.c
+++ b/lib/ext2fs/unix_io.c
@@ -15,6 +15,9 @@
  * %End-Header%
  */
 
+#define _XOPEN_SOURCE 600
+#define _DARWIN_C_SOURCE
+#define _FILE_OFFSET_BITS 64
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
 #ifndef _GNU_SOURCE
@@ -35,6 +38,9 @@
 #ifdef __linux__
 #include <sys/utsname.h>
 #endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
@@ -44,9 +50,6 @@
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
@@ -58,10 +61,6 @@
 #define BLKROGET   _IO(0x12, 94) /* Get read-only status (0 = read_write).  */
 #endif
 
-#if defined(__linux__) && defined(_IO) && !defined(BLKSSZGET)
-#define BLKSSZGET  _IO(0x12,104)/* get block device sector size */
-#endif
-
 #undef ALIGN_DEBUG
 
 #include "ext2_fs.h"
@@ -75,11 +74,11 @@
          if ((struct)->magic != (code)) return (code)
 
 struct unix_cache {
-       char            *buf;
-       unsigned long   block;
-       int             access_time;
-       unsigned        dirty:1;
-       unsigned        in_use:1;
+       char                    *buf;
+       unsigned long long      block;
+       int                     access_time;
+       unsigned                dirty:1;
+       unsigned                in_use:1;
 };
 
 #define CACHE_SIZE 8
@@ -123,6 +122,8 @@ static errcode_t unix_write_blk64(io_channel channel, unsigned long long block,
                                int count, const void *data);
 static errcode_t unix_discard(io_channel channel, unsigned long long block,
                              unsigned long long count);
+static errcode_t unix_readahead(io_channel channel, unsigned long block,
+                               int count);
 
 static struct struct_io_manager struct_unix_manager = {
        EXT2_ET_MAGIC_IO_MANAGER,
@@ -139,6 +140,7 @@ static struct struct_io_manager struct_unix_manager = {
        unix_read_blk64,
        unix_write_blk64,
        unix_discard,
+       unix_readahead,
 };
 
 io_manager unix_io_manager = &struct_unix_manager;
@@ -180,8 +182,9 @@ static errcode_t raw_read_blk(io_channel channel,
                retval = errno ? errno : EXT2_ET_LLSEEK_FAILED;
                goto error_out;
        }
-       if ((data->align == 0) ||
-           ((IS_ALIGNED(buf, data->align)) && IS_ALIGNED(size, data->align))) {
+       if ((channel->align == 0) ||
+           (IS_ALIGNED(buf, channel->align) &&
+            IS_ALIGNED(size, channel->align))) {
                actual = read(data->dev, buf, size);
                if (actual != size) {
                short_read:
@@ -250,8 +253,9 @@ static errcode_t raw_write_blk(io_channel channel,
                goto error_out;
        }
 
-       if ((data->align == 0) ||
-           ((IS_ALIGNED(buf, data->align)) && IS_ALIGNED(size, data->align))) {
+       if ((channel->align == 0) ||
+           (IS_ALIGNED(buf, channel->align) &&
+            IS_ALIGNED(size, channel->align))) {
                actual = write(data->dev, buf, size);
                if (actual != size) {
                short_write:
@@ -318,16 +322,14 @@ static errcode_t alloc_cache(io_channel channel,
                cache->in_use = 0;
                if (cache->buf)
                        ext2fs_free_mem(&cache->buf);
-               retval = ext2fs_get_memalign(channel->block_size,
-                                            data->align, &cache->buf);
+               retval = io_channel_alloc_buf(channel, 0, &cache->buf);
                if (retval)
                        return retval;
        }
-       if (data->align) {
+       if (channel->align) {
                if (data->bounce)
                        ext2fs_free_mem(&data->bounce);
-               retval = ext2fs_get_memalign(channel->block_size, data->align,
-                                            &data->bounce);
+               retval = io_channel_alloc_buf(channel, 0, &data->bounce);
        }
        return retval;
 }
@@ -439,6 +441,38 @@ static errcode_t flush_cached_blocks(io_channel channel,
 #endif
 #endif
 
+int ext2fs_open_file(const char *pathname, int flags, mode_t mode)
+{
+       if (mode)
+#if defined(HAVE_OPEN64) && !defined(__OSX_AVAILABLE_BUT_DEPRECATED)
+               return open64(pathname, flags, mode);
+       else
+               return open64(pathname, flags);
+#else
+               return open(pathname, flags, mode);
+       else
+               return open(pathname, flags);
+#endif
+}
+
+int ext2fs_stat(const char *path, ext2fs_struct_stat *buf)
+{
+#if defined(HAVE_FSTAT64) && !defined(__OSX_AVAILABLE_BUT_DEPRECATED)
+       return stat64(path, buf);
+#else
+       return stat(path, buf);
+#endif
+}
+
+int ext2fs_fstat(int fd, ext2fs_struct_stat *buf)
+{
+#if defined(HAVE_FSTAT64) && !defined(__OSX_AVAILABLE_BUT_DEPRECATED)
+       return fstat64(fd, buf);
+#else
+       return fstat(fd, buf);
+#endif
+}
+
 static errcode_t unix_open(const char *name, int flags, io_channel *channel)
 {
        io_channel      io = NULL;
@@ -482,11 +516,15 @@ static errcode_t unix_open(const char *name, int flags, io_channel *channel)
        if (flags & IO_FLAG_EXCLUSIVE)
                open_flags |= O_EXCL;
 #if defined(O_DIRECT)
-       if (flags & IO_FLAG_DIRECT_IO)
+       if (flags & IO_FLAG_DIRECT_IO) {
                open_flags |= O_DIRECT;
+               io->align = ext2fs_get_dio_alignment(data->dev);
+       }
 #elif defined(F_NOCACHE)
-       if (flags & IO_FLAG_DIRECT_IO)
+       if (flags & IO_FLAG_DIRECT_IO) {
                f_nocache = F_NOCACHE;
+               io->align = 4096;
+       }
 #endif
        data->flags = flags;
 
@@ -516,13 +554,6 @@ static errcode_t unix_open(const char *name, int flags, io_channel *channel)
                        io->flags |= CHANNEL_FLAGS_DISCARD_ZEROES;
        }
 
-#ifdef BLKSSZGET
-       if (flags & IO_FLAG_DIRECT_IO) {
-               if (ioctl(data->dev, BLKSSZGET, &data->align) != 0)
-                       data->align = io->block_size;
-       }
-#endif
-
 #ifdef BLKDISCARDZEROES
        ioctl(data->dev, BLKDISCARDZEROES, &zeroes);
        if (zeroes)
@@ -534,7 +565,8 @@ static errcode_t unix_open(const char *name, int flags, io_channel *channel)
         * Some operating systems require that the buffers be aligned,
         * regardless of O_DIRECT
         */
-       data->align = 512;
+       if (!io->align)
+               io->align = 512;
 #endif
 
 
@@ -793,6 +825,20 @@ static errcode_t unix_write_blk64(io_channel channel, unsigned long long block,
 #endif /* NO_IO_CACHE */
 }
 
+static errcode_t unix_readahead(io_channel channel, unsigned long block,
+                               int count)
+{
+#ifdef POSIX_FADV_WILLNEED
+       struct unix_private_data *data;
+
+       data = (struct unix_private_data *)channel->private_data;
+       posix_fadvise(data->dev, (ext2_loff_t)block * channel->block_size,
+                     (ext2_loff_t)count * channel->block_size,
+                     POSIX_FADV_WILLNEED);
+#endif
+       return 0;
+}
+
 static errcode_t unix_write_blk(io_channel channel, unsigned long block,
                                int count, const void *buf)
 {
@@ -810,7 +856,7 @@ static errcode_t unix_write_byte(io_channel channel, unsigned long offset,
        data = (struct unix_private_data *) channel->private_data;
        EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_UNIX_IO_CHANNEL);
 
-       if (data->align != 0) {
+       if (channel->align != 0) {
 #ifdef ALIGN_DEBUG
                printf("unix_write_byte: O_DIRECT fallback\n");
 #endif
@@ -905,7 +951,7 @@ static errcode_t unix_discard(io_channel channel, unsigned long long block,
                goto unimplemented;
 #endif
        } else {
-#ifdef FALLOC_FL_PUNCH_HOLE
+#if defined(HAVE_FALLOCATE) && defined(FALLOC_FL_PUNCH_HOLE)
                /*
                 * If we are not on block device, try to use punch hole
                 * to reclaim free space.
Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git