aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_icache.c
diff options
context:
space:
mode:
authorChristoph Hellwig <[email protected]>2021-03-29 18:11:40 +0000
committerDarrick J. Wong <[email protected]>2021-04-07 21:37:03 +0000
commit6e73a545f91e128d8dd7da1769dca200225f5d82 (patch)
tree906751d5c19e819b264ee0fa00eda26a8de6a89e /fs/xfs/xfs_icache.c
parentxfs: move the di_size field to struct xfs_inode (diff)
downloadkernel-6e73a545f91e128d8dd7da1769dca200225f5d82.tar.gz
kernel-6e73a545f91e128d8dd7da1769dca200225f5d82.zip
xfs: move the di_nblocks field to struct xfs_inode
In preparation of removing the historic icinode struct, move the nblocks field into the containing xfs_inode structure. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Signed-off-by: Darrick J. Wong <[email protected]>
Diffstat (limited to 'fs/xfs/xfs_icache.c')
-rw-r--r--fs/xfs/xfs_icache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index 47dfc70d4ed1..354ae9730003 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -64,7 +64,7 @@ xfs_inode_alloc(
ip->i_flags = 0;
ip->i_delayed_blks = 0;
ip->i_d.di_flags2 = mp->m_ino_geo.new_diflags2;
- ip->i_d.di_nblocks = 0;
+ ip->i_nblocks = 0;
ip->i_d.di_forkoff = 0;
ip->i_sick = 0;
ip->i_checked = 0;
@@ -309,7 +309,7 @@ xfs_iget_check_free_state(
return -EFSCORRUPTED;
}
- if (ip->i_d.di_nblocks != 0) {
+ if (ip->i_nblocks != 0) {
xfs_warn(ip->i_mount,
"Corruption detected! Free inode 0x%llx has blocks allocated!",
ip->i_ino);