Commit 684666e5 authored by Fabian Frederick's avatar Fabian Frederick Committed by Dave Kleikamp
Browse files

jfs: atomically read inode size 



See i_size_read() comments in include/linux/fs.h

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
parent d966564f

fs/jfs/resize.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) 
		goto out;

	}



	VolumeSize = sb->s_bdev->bd_inode->i_size >> sb->s_blocksize_bits;

	VolumeSize = i_size_read(sb->s_bdev->bd_inode) >> sb->s_blocksize_bits;



	if (VolumeSize) {

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



	/* Reset size of direct inode */

	sbi->direct_inode->i_size =  sb->s_bdev->bd_inode->i_size;

	sbi->direct_inode->i_size =  i_size_read(sb->s_bdev->bd_inode);



	if (sbi->mntflag & JFS_INLINELOG) {

		/*

fs/jfs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize, 
		}

		case Opt_resize_nosize:

		{

			*newLVSize = sb->s_bdev->bd_inode->i_size >>

			*newLVSize = i_size_read(sb->s_bdev->bd_inode) >>

				sb->s_blocksize_bits;

			if (*newLVSize == 0)

				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) 
		goto out_unload;

	}

	inode->i_ino = 0;

	inode->i_size = sb->s_bdev->bd_inode->i_size;

	inode->i_size = i_size_read(sb->s_bdev->bd_inode);

	inode->i_mapping->a_ops = &jfs_metapage_aops;

	hlist_add_fake(&inode->i_hash);

	mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS);