libext2fs: don't use O_DIRECT for files on tmpfs

[tools/e2fsprogs.git] / lib / ext2fs / valid_blk.c

diff --git a/lib/ext2fs/valid_blk.c b/lib/ext2fs/valid_blk.c
index 6a2aa47..db5d90a 100644 (file)
--- a/lib/ext2fs/valid_blk.c
+++ b/lib/ext2fs/valid_blk.c
@@ -4,12 +4,12 @@
  * Copyright 1997 by Theodore Ts'o
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
- *
  */
 
+#include "config.h"
 #include <stdio.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -24,7 +24,7 @@
  * This function returns 1 if the inode's block entries actually
  * contain block entries.
  */
-int ext2fs_inode_has_valid_blocks(struct ext2_inode *inode)
+int ext2fs_inode_has_valid_blocks2(ext2_filsys fs, struct ext2_inode *inode)
 {
        /*
         * Only directories, regular files, and some symbolic links
@@ -39,7 +39,7 @@ int ext2fs_inode_has_valid_blocks(struct ext2_inode *inode)
         * target is stored in the block entries.
         */
        if (LINUX_S_ISLNK (inode->i_mode)) {
-               if (ext2fs_file_acl_block(inode) == 0) {
+               if (ext2fs_file_acl_block(fs, inode) == 0) {
                        /* With no EA block, we can rely on i_blocks */
                        if (inode->i_blocks == 0)
                                return 0;
@@ -52,5 +52,17 @@ int ext2fs_inode_has_valid_blocks(struct ext2_inode *inode)
                        return 0; /* Probably a fast symlink */
                }
        }
+
+       /*
+        * If this inode has inline data, it shouldn't have valid block
+        * entries.
+        */
+       if (inode->i_flags & EXT4_INLINE_DATA_FL)
+               return 0;
        return 1;
 }
+
+int ext2fs_inode_has_valid_blocks(struct ext2_inode *inode)
+{
+       return ext2fs_inode_has_valid_blocks2(NULL, inode);
+}