ext2fs: add ext2fs_get_stat_i_blocks() function

The function ext2fs_inode_i_blocks() is a bit confusing whether it is
returning the inode's i_blocks value, or whether it is returning the
value ala the stat(2) system call, which returns i_blocks in units of
512 byte sectors.  This caused ext2fs_inode_i_blocks() to be
incorrectly used in fuse2fs and the function quota_compute_usage().

To address this, we add a new function, ext2fs_get_stat_i_blocks()
which is clearly labelled what it is returning, and use it in fuse2fs
and quota_compute_usage().  It's also a bit more convenient to use it
in e2fsck, so use it there too.

Reported-by: Wang Shilong <wangshilong1991@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/e2fsck/extents.c b/e2fsck/extents.c
index 3073725ab55b2c48dceb339ef25aeb864437d9e6..e9af1bbeb491445ccef5a333c42039e8fb3cd732 100644 (file)
--- a/e2fsck/extents.c
+++ b/e2fsck/extents.c
@@ -264,7 +264,7 @@ extents_loaded:
                goto err;
 
        ext_written = 0;
-       start_val = ext2fs_inode_i_blocks(ctx->fs, EXT2_INODE(&inode));
+       start_val = ext2fs_get_stat_i_blocks(ctx->fs, EXT2_INODE(&inode));
        for (i = 0, ex = list->extents; i < list->count; i++, ex++) {
                memcpy(&extent, ex, sizeof(struct ext2fs_extent));
                extent.e_flags &= EXT2_EXTENT_FLAGS_UNINIT;
@@ -302,15 +302,10 @@ extents_loaded:
                ext_written++;
        }
 
-       delta = ext2fs_inode_i_blocks(ctx->fs, EXT2_INODE(&inode)) - start_val;
-       if (delta) {
-               if (!ext2fs_has_feature_huge_file(ctx->fs->super) ||
-                   !(inode.i_flags & EXT4_HUGE_FILE_FL))
-                       delta <<= 9;
-               else
-                       delta *= ctx->fs->blocksize;
-               quota_data_add(ctx->qctx, &inode, ino, delta);
-       }
+       delta = ext2fs_get_stat_i_blocks(ctx->fs, EXT2_INODE(&inode)) -
+               start_val;
+       if (delta)
+               quota_data_add(ctx->qctx, &inode, ino, delta << 9);
 
 #if defined(DEBUG) || defined(DEBUG_SUMMARY)
        printf("rebuild: ino=%d extents=%d->%d\n", ino, list->ext_read,

diff --git a/lib/ext2fs/blknum.c b/lib/ext2fs/blknum.c
index 9ee5c66e2c5f5ee4080c0b0c3752f13e7f80a29f..31055c34c69c2d70059b6849c5aca5af0ccc7975 100644 (file)
--- a/lib/ext2fs/blknum.c
+++ b/lib/ext2fs/blknum.c
@@ -85,6 +85,22 @@ blk64_t ext2fs_inode_i_blocks(ext2_filsys fs,
                 (__u64)inode->osd2.linux2.l_i_blocks_hi << 32 : 0));
 }
 
+/*
+ * Return the inode i_blocks in stat (512 byte) units
+ */
+blk64_t ext2fs_get_stat_i_blocks(ext2_filsys fs,
+                                struct ext2_inode *inode)
+{
+       blk64_t ret = inode->i_blocks;
+
+       if (ext2fs_has_feature_huge_file(fs->super)) {
+               ret += ((long long) inode->osd2.linux2.l_i_blocks_hi) << 32;
+               if (inode->i_flags & EXT4_HUGE_FILE_FL)
+                       ret *= (fs->blocksize / 512);
+       }
+       return ret;
+}
+
 /*
  * Return the fs block count
  */

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 59fd97426f917ac19b8dfdf2231411434bca7372..ca5e3321a54e49131a9e37c721ca6743bde3aca2 100644 (file)
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -908,7 +908,9 @@ extern int ext2fs_group_blocks_count(ext2_filsys fs, dgrp_t group);
 extern blk64_t ext2fs_inode_data_blocks2(ext2_filsys fs,
                                         struct ext2_inode *inode);
 extern blk64_t ext2fs_inode_i_blocks(ext2_filsys fs,
-                                        struct ext2_inode *inode);
+                                    struct ext2_inode *inode);
+extern blk64_t ext2fs_get_stat_i_blocks(ext2_filsys fs,
+                                       struct ext2_inode *inode);
 extern blk64_t ext2fs_blocks_count(struct ext2_super_block *super);
 extern void ext2fs_blocks_count_set(struct ext2_super_block *super,
                                    blk64_t blk);

diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c
index ddb5312478196bdd756cf99107e7eef3bce99748..6f7ae6d6ad45be2451202bcf2705cf397d5bc98c 100644 (file)
--- a/lib/support/mkquota.c
+++ b/lib/support/mkquota.c
@@ -503,8 +503,8 @@ errcode_t quota_compute_usage(quota_ctx_t qctx)
                if (inode->i_links_count &&
                    (ino == EXT2_ROOT_INO ||
                     ino >= EXT2_FIRST_INODE(fs->super))) {
-                       space = ext2fs_inode_i_blocks(fs,
-                                                     EXT2_INODE(inode)) << 9;
+                       space = ext2fs_get_stat_i_blocks(fs,
+                                               EXT2_INODE(inode)) << 9;
                        quota_data_add(qctx, inode, ino, space);
                        quota_data_inodes(qctx, inode, ino, +1);
                }

diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
index 94cd5f674fc47d02ddec68ca58be047625681d59..68ddddd3bed863fdbeedc93bba874f999afb65b2 100644 (file)
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -754,23 +754,6 @@ static void *op_init(struct fuse_conn_info *conn)
        return ff;
 }
 
-static blkcnt_t blocks_from_inode(ext2_filsys fs,
-                                 struct ext2_inode_large *inode)
-{
-       blkcnt_t b;
-
-       b = inode->i_blocks;
-       if (ext2fs_has_feature_huge_file(fs->super))
-               b += ((long long) inode->osd2.linux2.l_i_blocks_hi) << 32;
-
-       if (!ext2fs_has_feature_huge_file(fs->super) ||
-           !(inode->i_flags & EXT4_HUGE_FILE_FL))
-               b *= fs->blocksize / 512;
-       b *= EXT2FS_CLUSTER_RATIO(fs);
-
-       return b;
-}
-
 static int stat_inode(ext2_filsys fs, ext2_ino_t ino, struct stat *statbuf)
 {
        struct ext2_inode_large inode;
@@ -794,7 +777,8 @@ static int stat_inode(ext2_filsys fs, ext2_ino_t ino, struct stat *statbuf)
        statbuf->st_gid = inode_gid(inode);
        statbuf->st_size = EXT2_I_SIZE(&inode);
        statbuf->st_blksize = fs->blocksize;
-       statbuf->st_blocks = blocks_from_inode(fs, &inode);
+       statbuf->st_blocks = ext2fs_get_stat_i_blocks(fs,
+                                               (struct ext2_inode *)&inode);
        EXT4_INODE_GET_XTIME(i_atime, &tv, &inode);
        statbuf->st_atime = tv.tv_sec;
        EXT4_INODE_GET_XTIME(i_mtime, &tv, &inode);