Whamcloud - gitweb
libext2fs: allocate clusters to files in expand_dir.c and mkjournal.c
[tools/e2fsprogs.git] / lib / ext2fs / inode.c
index bd568b3..a762dbc 100644 (file)
@@ -1,11 +1,11 @@
 /*
  * inode.c --- utility routines to read and write inodes
- * 
+ *
  * Copyright (C) 1993, 1994, 1995, 1996, 1997 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%
  */
 
@@ -17,6 +17,7 @@
 #if HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#include <time.h>
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
@@ -32,7 +33,7 @@ struct ext2_struct_inode_scan {
        errcode_t               magic;
        ext2_filsys             fs;
        ext2_ino_t              current_inode;
-       blk_t                   current_block;
+       blk64_t                 current_block;
        dgrp_t                  current_group;
        ext2_ino_t              inodes_left;
        blk_t                   blocks_left;
@@ -59,7 +60,7 @@ struct ext2_struct_inode_scan {
 errcode_t ext2fs_flush_icache(ext2_filsys fs)
 {
        int     i;
-       
+
        if (!fs->icache)
                return 0;
 
@@ -73,7 +74,7 @@ errcode_t ext2fs_flush_icache(ext2_filsys fs)
 static errcode_t create_icache(ext2_filsys fs)
 {
        errcode_t       retval;
-       
+
        if (fs->icache)
                return 0;
        retval = ext2fs_get_mem(sizeof(struct ext2_inode_cache), &fs->icache);
@@ -142,13 +143,21 @@ errcode_t ext2fs_open_inode_scan(ext2_filsys fs, int buffer_blocks,
        scan->current_group = 0;
        scan->groups_left = fs->group_desc_count - 1;
        scan->inode_buffer_blocks = buffer_blocks ? buffer_blocks : 8;
-       scan->current_block = scan->fs->
-               group_desc[scan->current_group].bg_inode_table;
+       scan->current_block = ext2fs_inode_table_loc(scan->fs,
+                                                    scan->current_group);
        scan->inodes_left = EXT2_INODES_PER_GROUP(scan->fs->super);
        scan->blocks_left = scan->fs->inode_blocks_per_group;
-       retval = ext2fs_get_array(scan->inode_buffer_blocks,
-                                         fs->blocksize,
-                               &scan->inode_buffer);
+       if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+                                      EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
+               scan->inodes_left -=
+                       ext2fs_bg_itable_unused(fs, scan->current_group);
+               scan->blocks_left =
+                       (scan->inodes_left +
+                        (fs->blocksize / scan->inode_size - 1)) *
+                       scan->inode_size / fs->blocksize;
+       }
+       retval = ext2fs_get_memalign(scan->inode_buffer_blocks * fs->blocksize,
+                                    fs->blocksize, &scan->inode_buffer);
        scan->done_group = 0;
        scan->done_group_data = 0;
        scan->bad_block_ptr = 0;
@@ -164,9 +173,6 @@ errcode_t ext2fs_open_inode_scan(ext2_filsys fs, int buffer_blocks,
        }
        if (scan->fs->badblocks && scan->fs->badblocks->num)
                scan->scan_flags |= EXT2_SF_CHK_BADBLOCKS;
-       if (EXT2_HAS_COMPAT_FEATURE(fs->super, 
-                                   EXT2_FEATURE_COMPAT_LAZY_BG))
-               scan->scan_flags |= EXT2_SF_DO_LAZY;
        if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
                                       EXT4_FEATURE_RO_COMPAT_GDT_CSUM))
                scan->scan_flags |= EXT2_SF_DO_LAZY;
@@ -178,7 +184,7 @@ void ext2fs_close_inode_scan(ext2_inode_scan scan)
 {
        if (!scan || (scan->magic != EXT2_ET_MAGIC_INODE_SCAN))
                return;
-       
+
        ext2fs_free_mem(&scan->inode_buffer);
        scan->inode_buffer = NULL;
        ext2fs_free_mem(&scan->temp_buffer);
@@ -196,7 +202,7 @@ void ext2fs_set_inode_callback(ext2_inode_scan scan,
 {
        if (!scan || (scan->magic != EXT2_ET_MAGIC_INODE_SCAN))
                return;
-       
+
        scan->done_group = done_group;
        scan->done_group_data = done_group_data;
 }
@@ -226,8 +232,8 @@ static errcode_t get_next_blockgroup(ext2_inode_scan scan)
        scan->current_group++;
        scan->groups_left--;
 
-       scan->current_block =fs->group_desc[scan->current_group].bg_inode_table;
-
+       scan->current_block = ext2fs_inode_table_loc(scan->fs,
+                                                    scan->current_group);
        scan->current_inode = scan->current_group *
                EXT2_INODES_PER_GROUP(fs->super);
 
@@ -237,7 +243,7 @@ static errcode_t get_next_blockgroup(ext2_inode_scan scan)
        if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
                                       EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
                scan->inodes_left -=
-                       fs->group_desc[scan->current_group].bg_itable_unused;
+                       ext2fs_bg_itable_unused(fs, scan->current_group);
                scan->blocks_left =
                        (scan->inodes_left +
                         (fs->blocksize / scan->inode_size - 1)) *
@@ -352,13 +358,13 @@ static errcode_t get_next_blocks(ext2_inode_scan scan)
                if (retval)
                        return retval;
        }
-               
+
        if ((scan->scan_flags & EXT2_SF_BAD_INODE_BLK) ||
            (scan->current_block == 0)) {
                memset(scan->inode_buffer, 0,
                       (size_t) num_blocks * scan->fs->blocksize);
        } else {
-               retval = io_channel_read_blk(scan->fs->io,
+               retval = io_channel_read_blk64(scan->fs->io,
                                             scan->current_block,
                                             (int) num_blocks,
                                             scan->inode_buffer);
@@ -384,7 +390,7 @@ static errcode_t get_next_blocks(ext2_inode_scan scan)
 static inline int is_empty_scan(ext2_inode_scan scan)
 {
        int     i;
-       
+
        if (scan->bytes_left == 0)
                return 0;
 
@@ -400,7 +406,7 @@ errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, ext2_ino_t *ino,
 {
        errcode_t       retval;
        int             extra_bytes = 0;
-       
+
        EXT2_CHECK_MAGIC(scan, EXT2_ET_MAGIC_INODE_SCAN);
 
        /*
@@ -424,12 +430,12 @@ errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, ext2_ino_t *ino,
                        return retval;
        }
        /*
-        * These checks are done outside the above if statement so 
+        * These checks are done outside the above if statement so
         * they can be done for block group #0.
         */
        if ((scan->scan_flags & EXT2_SF_DO_LAZY) &&
-           (scan->fs->group_desc[scan->current_group].bg_flags &
-            EXT2_BG_INODE_UNINIT))
+           (ext2fs_bg_flags_test(scan->fs, scan->current_group, EXT2_BG_INODE_UNINIT)
+            ))
                goto force_new_group;
        if (scan->inodes_left == 0)
                goto force_new_group;
@@ -439,7 +445,7 @@ errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, ext2_ino_t *ino,
                } else
                        return EXT2_ET_MISSING_INODE_TABLE;
        }
-       
+
 
        /*
         * Have we run out of space in the inode buffer?  If so, we
@@ -471,9 +477,9 @@ errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, ext2_ino_t *ino,
 
 #ifdef WORDS_BIGENDIAN
                memset(inode, 0, bufsize);
-               ext2fs_swap_inode_full(scan->fs, 
+               ext2fs_swap_inode_full(scan->fs,
                               (struct ext2_inode_large *) inode,
-                              (struct ext2_inode_large *) scan->temp_buffer, 
+                              (struct ext2_inode_large *) scan->temp_buffer,
                               0, bufsize);
 #else
                *inode = *((struct ext2_inode *) scan->temp_buffer);
@@ -484,7 +490,7 @@ errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, ext2_ino_t *ino,
        } else {
 #ifdef WORDS_BIGENDIAN
                memset(inode, 0, bufsize);
-               ext2fs_swap_inode_full(scan->fs, 
+               ext2fs_swap_inode_full(scan->fs,
                                (struct ext2_inode_large *) inode,
                                (struct ext2_inode_large *) scan->ptr,
                                0, bufsize);
@@ -530,6 +536,8 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino,
                if (retval != EXT2_ET_CALLBACK_NOTHANDLED)
                        return retval;
        }
+       if ((ino == 0) || (ino > fs->super->s_inodes_count))
+               return EXT2_ET_BAD_INODE_NUM;
        /* Create inode cache if not present */
        if (!fs->icache) {
                retval = create_icache(fs);
@@ -538,7 +546,7 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino,
        }
        /* Check to see if it's in the inode cache */
        if (bufsize == sizeof(struct ext2_inode)) {
-               /* only old good inode can be retrieve from the cache */
+               /* only old good inode can be retrieved from the cache */
                for (i=0; i < fs->icache->cache_size; i++) {
                        if (fs->icache->cache[i].ino == ino) {
                                *inode = fs->icache->cache[i].inode;
@@ -546,8 +554,6 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino,
                        }
                }
        }
-       if ((ino == 0) || (ino > fs->super->s_inodes_count))
-               return EXT2_ET_BAD_INODE_NUM;
        if (fs->flags & EXT2_FLAG_IMAGE_FILE) {
                inodes_per_block = fs->blocksize / EXT2_INODE_SIZE(fs->super);
                block_nr = fs->image_header->offset_inode / fs->blocksize;
@@ -557,12 +563,14 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino,
                io = fs->image_io;
        } else {
                group = (ino - 1) / EXT2_INODES_PER_GROUP(fs->super);
+               if (group > fs->group_desc_count)
+                       return EXT2_ET_BAD_INODE_NUM;
                offset = ((ino - 1) % EXT2_INODES_PER_GROUP(fs->super)) *
                        EXT2_INODE_SIZE(fs->super);
                block = offset >> EXT2_BLOCK_SIZE_BITS(fs->super);
-               if (!fs->group_desc[(unsigned)group].bg_inode_table)
+               if (!ext2fs_inode_table_loc(fs, (unsigned) group))
                        return EXT2_ET_MISSING_INODE_TABLE;
-               block_nr = fs->group_desc[(unsigned)group].bg_inode_table + 
+               block_nr = ext2fs_inode_table_loc(fs, group) +
                        block;
                io = fs->io;
        }
@@ -579,7 +587,7 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino,
                        clen = fs->blocksize - offset;
 
                if (block_nr != fs->icache->buffer_blk) {
-                       retval = io_channel_read_blk(io, block_nr, 1,
+                       retval = io_channel_read_blk64(io, block_nr, 1,
                                                     fs->icache->buffer);
                        if (retval)
                                return retval;
@@ -596,8 +604,8 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino,
        }
 
 #ifdef WORDS_BIGENDIAN
-       ext2fs_swap_inode_full(fs, (struct ext2_inode_large *) inode, 
-                              (struct ext2_inode_large *) inode, 
+       ext2fs_swap_inode_full(fs, (struct ext2_inode_large *) inode,
+                              (struct ext2_inode_large *) inode,
                               0, bufsize);
 #endif
 
@@ -606,7 +614,7 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino,
                fs->icache->cache_size;
        fs->icache->cache[fs->icache->cache_last].ino = ino;
        fs->icache->cache[fs->icache->cache_last].inode = *inode;
-       
+
        return 0;
 }
 
@@ -648,7 +656,7 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino,
                if (retval)
                        return retval;
        }
-               
+
        if (!(fs->flags & EXT2_FLAG_RW))
                return EXT2_ET_RO_FILSYS;
 
@@ -668,8 +676,8 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino,
        memset(w_inode, 0, length);
 
 #ifdef WORDS_BIGENDIAN
-       ext2fs_swap_inode_full(fs, w_inode, 
-                              (struct ext2_inode_large *) inode, 
+       ext2fs_swap_inode_full(fs, w_inode,
+                              (struct ext2_inode_large *) inode,
                               1, bufsize);
 #else
        memcpy(w_inode, inode, bufsize);
@@ -679,11 +687,11 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino,
        offset = ((ino - 1) % EXT2_INODES_PER_GROUP(fs->super)) *
                EXT2_INODE_SIZE(fs->super);
        block = offset >> EXT2_BLOCK_SIZE_BITS(fs->super);
-       if (!fs->group_desc[(unsigned) group].bg_inode_table) {
+       if (!ext2fs_inode_table_loc(fs, (unsigned) group)) {
                retval = EXT2_ET_MISSING_INODE_TABLE;
                goto errout;
        }
-       block_nr = fs->group_desc[(unsigned) group].bg_inode_table + block;
+       block_nr = ext2fs_inode_table_loc(fs, (unsigned) group) + block;
 
        offset &= (EXT2_BLOCK_SIZE(fs->super) - 1);
 
@@ -699,18 +707,18 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino,
                        clen = fs->blocksize - offset;
 
                if (fs->icache->buffer_blk != block_nr) {
-                       retval = io_channel_read_blk(fs->io, block_nr, 1,
+                       retval = io_channel_read_blk64(fs->io, block_nr, 1,
                                                     fs->icache->buffer);
                        if (retval)
                                goto errout;
                        fs->icache->buffer_blk = block_nr;
                }
 
-       
-               memcpy((char *) fs->icache->buffer + (unsigned) offset, 
+
+               memcpy((char *) fs->icache->buffer + (unsigned) offset,
                       ptr, clen);
 
-               retval = io_channel_write_blk(fs->io, block_nr, 1, 
+               retval = io_channel_write_blk64(fs->io, block_nr, 1,
                                              fs->icache->buffer);
                if (retval)
                        goto errout;
@@ -720,7 +728,7 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino,
                length -= clen;
                block_nr++;
        }
-               
+
        fs->flags |= EXT2_FLAG_CHANGED;
 errout:
        if (w_inode && w_inode != &temp_inode)
@@ -735,7 +743,7 @@ errcode_t ext2fs_write_inode(ext2_filsys fs, ext2_ino_t ino,
                                       sizeof(struct ext2_inode));
 }
 
-/* 
+/*
  * This function should be called when writing a new inode.  It makes
  * sure that extra part of large inodes is initialized properly.
  */
@@ -746,6 +754,14 @@ errcode_t ext2fs_write_new_inode(ext2_filsys fs, ext2_ino_t ino,
        int                     size = EXT2_INODE_SIZE(fs->super);
        struct ext2_inode_large *large_inode;
        errcode_t               retval;
+       __u32                   t = fs->now ? fs->now : time(NULL);
+
+       if (!inode->i_ctime)
+               inode->i_ctime = t;
+       if (!inode->i_mtime)
+               inode->i_mtime = t;
+       if (!inode->i_atime)
+               inode->i_atime = t;
 
        if (size == sizeof(struct ext2_inode))
                return ext2fs_write_inode_full(fs, ino, inode,
@@ -759,21 +775,23 @@ errcode_t ext2fs_write_new_inode(ext2_filsys fs, ext2_ino_t ino,
        *buf = *inode;
 
        large_inode = (struct ext2_inode_large *) buf;
-       large_inode->i_extra_isize = sizeof(struct ext2_inode_large) - 
+       large_inode->i_extra_isize = sizeof(struct ext2_inode_large) -
                EXT2_GOOD_OLD_INODE_SIZE;
+       if (!large_inode->i_crtime)
+               large_inode->i_crtime = t;
 
        retval = ext2fs_write_inode_full(fs, ino, buf, size);
        free(buf);
        return retval;
 }
 
+
 errcode_t ext2fs_get_blocks(ext2_filsys fs, ext2_ino_t ino, blk_t *blocks)
 {
        struct ext2_inode       inode;
        int                     i;
        errcode_t               retval;
-       
+
        EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
 
        if (ino > fs->super->s_inodes_count)
@@ -795,7 +813,7 @@ errcode_t ext2fs_check_directory(ext2_filsys fs, ext2_ino_t ino)
 {
        struct  ext2_inode      inode;
        errcode_t               retval;
-       
+
        EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
 
        if (ino > fs->super->s_inodes_count)