From: Wang Shilong <wshilong@xxxxxxx>
According to following logic:
"If the huge_file feature flag is not set on the filesystem,
the file consumes i_blocks_lo 512-byte blocks on disk.
If huge_file is set and EXT4_HUGE_FILE_FL is NOT set in
inode.i_flags, then the file consumes i_blocks_lo + (i_blocks_hi << 32)
512-byte blocks on disk. If huge_file is set and EXT4_HUGE_FILE_FL IS set
in inode.i_flags, then this file consumes (i_blocks_lo + i_blocks_hi << 32)
filesystem blocks on disk."
blocks_from_inode() did not return wrong inode blocks, and
ext2fs_inode_i_blocks() is not taking EXT4_HUGE_FILE_FL into account
at all, while the some callers deal it correctly, some not. This patch
try to unify to handle it in ext2fs_inode_i_blocks() to return.
blocks(based on 512 bytes)
Signed-off-by: Wang Shilong <wshilong@xxxxxxx>
---
debugfs/filefrag.c | 4 ----
e2fsck/extents.c | 6 +-----
lib/ext2fs/blknum.c | 13 ++++++++++---
lib/support/mkquota.c | 3 ++-
misc/fuse2fs.c | 19 +------------------
5 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/debugfs/filefrag.c b/debugfs/filefrag.c
index 961b6962..3e818b19 100644
--- a/debugfs/filefrag.c
+++ b/debugfs/filefrag.c
@@ -145,10 +145,6 @@ static void filefrag(ext2_ino_t ino, struct ext2_inode *inode,
if (fs->options & VERBOSE_OPT) {
blk64_t num_blocks = ext2fs_inode_i_blocks(current_fs, inode);
- if (!ext2fs_has_feature_huge_file(current_fs->super) ||
- !(inode->i_flags & EXT4_HUGE_FILE_FL))
- num_blocks /= current_fs->blocksize / 512;
-
fprintf(fs->f, "\n%s has %llu block(s), i_size is %llu\n",
fs->name, num_blocks, EXT2_I_SIZE(inode));
}
diff --git a/e2fsck/extents.c b/e2fsck/extents.c
index 3073725a..d9509297 100644
--- a/e2fsck/extents.c
+++ b/e2fsck/extents.c
@@ -304,11 +304,7 @@ extents_loaded:
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;
+ delta *= 512;
quota_data_add(ctx->qctx, &inode, ino, delta);
}
diff --git a/lib/ext2fs/blknum.c b/lib/ext2fs/blknum.c
index 18af3408..6ab843c4 100644
--- a/lib/ext2fs/blknum.c
+++ b/lib/ext2fs/blknum.c
@@ -80,9 +80,16 @@ blk64_t ext2fs_inode_data_blocks2(ext2_filsys fs,
blk64_t ext2fs_inode_i_blocks(ext2_filsys fs,
struct ext2_inode *inode)
{
- return (inode->i_blocks |
- (ext2fs_has_feature_huge_file(fs->super) ?
- (__u64)inode->osd2.linux2.l_i_blocks_hi << 32 : 0));
+ blkcnt_t i_blocks = inode->i_blocks;
+
+ if (ext2fs_has_feature_huge_file(fs->super)) {
+ i_blocks += ((long long) inode->osd2.linux2.l_i_blocks_hi) << 32;
+ if (inode->i_flags & EXT4_HUGE_FILE_FL)
+ i_blocks *= (fs->blocksize / 512);
+
+ }
+
+ return i_blocks;
}
/*
diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c
index ddb53124..2b0c6fb5 100644
--- a/lib/support/mkquota.c
+++ b/lib/support/mkquota.c
@@ -504,7 +504,8 @@ errcode_t quota_compute_usage(quota_ctx_t qctx)
(ino == EXT2_ROOT_INO ||
ino >= EXT2_FIRST_INODE(fs->super))) {
space = ext2fs_inode_i_blocks(fs,
- EXT2_INODE(inode)) << 9;
+ EXT2_INODE(inode));
+ space *= 512;;
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 dc7a0392..748e3f7c 100644
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -755,23 +755,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;
@@ -795,7 +778,7 @@ static int stat_inode(ext2_filsys fs, ext2_ino_t ino, struct stat *statbuf)
statbuf->st_gid = inode.i_gid;
statbuf->st_size = EXT2_I_SIZE(&inode);
statbuf->st_blksize = fs->blocksize;
- statbuf->st_blocks = blocks_from_inode(fs, &inode);
+ statbuf->st_blocks = ext2fs_inode_i_blocks(fs, &inode);
EXT4_INODE_GET_XTIME(i_atime, &tv, &inode);
statbuf->st_atime = tv.tv_sec;
EXT4_INODE_GET_XTIME(i_mtime, &tv, &inode);
--
2.21.0
