Skip to content

Commit 684666e

Browse files
Fabian Frederickkleikamp
authored andcommitted
jfs: atomically read inode size
See i_size_read() comments in include/linux/fs.h Signed-off-by: Fabian Frederick <[email protected]> Signed-off-by: Dave Kleikamp <[email protected]>
1 parent d966564 commit 684666e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

fs/jfs/resize.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
9898
goto out;
9999
}
100100

101-
VolumeSize = sb->s_bdev->bd_inode->i_size >> sb->s_blocksize_bits;
101+
VolumeSize = i_size_read(sb->s_bdev->bd_inode) >> sb->s_blocksize_bits;
102102

103103
if (VolumeSize) {
104104
if (newLVSize > VolumeSize) {
@@ -211,7 +211,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
211211
txQuiesce(sb);
212212

213213
/* Reset size of direct inode */
214-
sbi->direct_inode->i_size = sb->s_bdev->bd_inode->i_size;
214+
sbi->direct_inode->i_size = i_size_read(sb->s_bdev->bd_inode);
215215

216216
if (sbi->mntflag & JFS_INLINELOG) {
217217
/*

fs/jfs/super.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
283283
}
284284
case Opt_resize_nosize:
285285
{
286-
*newLVSize = sb->s_bdev->bd_inode->i_size >>
286+
*newLVSize = i_size_read(sb->s_bdev->bd_inode) >>
287287
sb->s_blocksize_bits;
288288
if (*newLVSize == 0)
289289
pr_err("JFS: Cannot determine volume size\n");
@@ -549,7 +549,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
549549
goto out_unload;
550550
}
551551
inode->i_ino = 0;
552-
inode->i_size = sb->s_bdev->bd_inode->i_size;
552+
inode->i_size = i_size_read(sb->s_bdev->bd_inode);
553553
inode->i_mapping->a_ops = &jfs_metapage_aops;
554554
hlist_add_fake(&inode->i_hash);
555555
mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS);

0 commit comments

Comments
 (0)