Add an option to debugfs to open filesystems in exclusive mode

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

diff --git a/lib/ext2fs/newdir.c b/lib/ext2fs/newdir.c
index ed29a6f..3904d91 100644 (file)
--- a/lib/ext2fs/newdir.c
+++ b/lib/ext2fs/newdir.c
@@ -15,24 +15,28 @@
 #include <unistd.h>
 #endif
 
-#include <linux/ext2_fs.h>
-
+#include "ext2_fs.h"
 #include "ext2fs.h"
 
+#ifndef EXT2_FT_DIR
+#define EXT2_FT_DIR            2
+#endif
+
 /*
  * Create new directory block
  */
-errcode_t ext2fs_new_dir_block(ext2_filsys fs, ino_t dir_ino, ino_t parent_ino,
-                              char **block)
+errcode_t ext2fs_new_dir_block(ext2_filsys fs, ext2_ino_t dir_ino,
+                              ext2_ino_t parent_ino, char **block)
 {
        struct ext2_dir_entry   *dir = NULL;
        errcode_t               retval;
        char                    *buf;
        int                     rec_len;
+       int                     filetype = 0;
 
        EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
 
-       retval = ext2fs_get_mem(fs->blocksize, (void **) &buf);
+       retval = ext2fs_get_mem(fs->blocksize, &buf);
        if (retval)
                return retval;
        memset(buf, 0, fs->blocksize);
@@ -40,14 +44,17 @@ errcode_t ext2fs_new_dir_block(ext2_filsys fs, ino_t dir_ino, ino_t parent_ino,
        dir->rec_len = fs->blocksize;
 
        if (dir_ino) {
+               if (fs->super->s_feature_incompat &
+                   EXT2_FEATURE_INCOMPAT_FILETYPE)
+                       filetype = EXT2_FT_DIR << 8;
                /*
                 * Set up entry for '.'
                 */
                dir->inode = dir_ino;
-               dir->name_len = 1;
+               dir->name_len = 1 | filetype;
                dir->name[0] = '.';
-               rec_len = dir->rec_len - EXT2_DIR_REC_LEN(dir->name_len);
-               dir->rec_len = EXT2_DIR_REC_LEN(dir->name_len);
+               rec_len = dir->rec_len - EXT2_DIR_REC_LEN(1);
+               dir->rec_len = EXT2_DIR_REC_LEN(1);
 
                /*
                 * Set up entry for '..'
@@ -55,7 +62,7 @@ errcode_t ext2fs_new_dir_block(ext2_filsys fs, ino_t dir_ino, ino_t parent_ino,
                dir = (struct ext2_dir_entry *) (buf + dir->rec_len);
                dir->rec_len = rec_len;
                dir->inode = parent_ino;
-               dir->name_len = 2;
+               dir->name_len = 2 | filetype;
                dir->name[0] = '.';
                dir->name[1] = '.';