Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f50f3ac5 authored by Anton Altaparmakov's avatar Anton Altaparmakov
Browse files

NTFS: Use i_size_read() in fs/ntfs/inode.c once and then use the cached value 


      afterwards when reading the size of the bitmap inode.

Signed-off-by: default avatarAnton Altaparmakov <aia21@cantab.net>
parent 218357ff

fs/ntfs/ChangeLog

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ ToDo/Notes: 
	  value afterwards.  Cache the initialized_size in the same way and

	  protect access to the two sizes using the size_lock.

	- Minor optimization to fs/ntfs/super.c::ntfs_statfs() and its helpers.

	- Use i_size_read() in fs/ntfs/inode.c once and then use the cached

	  value afterwards when reading the size of the bitmap inode.



2.1.22 - Many bug and race fixes and error handling improvements.

fs/ntfs/inode.c

+14 −11
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ struct inode *ntfs_iget(struct super_block *sb, unsigned long mft_no) 


	vi = iget5_locked(sb, mft_no, (test_t)ntfs_test_inode,

			(set_t)ntfs_init_locked_inode, &na);

	if (!vi)

	if (unlikely(!vi))

		return ERR_PTR(-ENOMEM);



	err = 0;
@@ -188,7 +188,7 @@ struct inode *ntfs_iget(struct super_block *sb, unsigned long mft_no) 
	 * There is no point in keeping bad inodes around if the failure was

	 * due to ENOMEM. We want to be able to retry again later.

	 */

	if (err == -ENOMEM) {

	if (unlikely(err == -ENOMEM)) {

		iput(vi);

		vi = ERR_PTR(err);

	}
@@ -235,7 +235,7 @@ struct inode *ntfs_attr_iget(struct inode *base_vi, ATTR_TYPE type, 


	vi = iget5_locked(base_vi->i_sb, na.mft_no, (test_t)ntfs_test_inode,

			(set_t)ntfs_init_locked_inode, &na);

	if (!vi)

	if (unlikely(!vi))

		return ERR_PTR(-ENOMEM);



	err = 0;
@@ -250,7 +250,7 @@ struct inode *ntfs_attr_iget(struct inode *base_vi, ATTR_TYPE type, 
	 * simplifies things in that we never need to check for bad attribute

	 * inodes elsewhere.

	 */

	if (err) {

	if (unlikely(err)) {

		iput(vi);

		vi = ERR_PTR(err);

	}
@@ -290,7 +290,7 @@ struct inode *ntfs_index_iget(struct inode *base_vi, ntfschar *name, 


	vi = iget5_locked(base_vi->i_sb, na.mft_no, (test_t)ntfs_test_inode,

			(set_t)ntfs_init_locked_inode, &na);

	if (!vi)

	if (unlikely(!vi))

		return ERR_PTR(-ENOMEM);



	err = 0;
@@ -305,7 +305,7 @@ struct inode *ntfs_index_iget(struct inode *base_vi, ntfschar *name, 
	 * simplifies things in that we never need to check for bad index

	 * inodes elsewhere.

	 */

	if (err) {

	if (unlikely(err)) {

		iput(vi);

		vi = ERR_PTR(err);

	}
@@ -742,6 +742,7 @@ static int ntfs_read_locked_inode(struct inode *vi) 
	 * in ntfs_ino->attr_list and it is ntfs_ino->attr_list_size bytes.

	 */

	if (S_ISDIR(vi->i_mode)) {

		loff_t bvi_size;

		struct inode *bvi;

		ntfs_inode *bni;

		INDEX_ROOT *ir;
@@ -959,11 +960,12 @@ static int ntfs_read_locked_inode(struct inode *vi) 
			goto unm_err_out;

		}

		/* Consistency check bitmap size vs. index allocation size. */

		if ((bvi->i_size << 3) < (vi->i_size >>

		bvi_size = i_size_read(bvi);

		if ((bvi_size << 3) < (vi->i_size >>

				ni->itype.index.block_size_bits)) {

			ntfs_error(vi->i_sb, "Index bitmap too small (0x%llx) "

					"for index allocation (0x%llx).",

					bvi->i_size << 3, vi->i_size);

					bvi_size << 3, vi->i_size);

			goto unm_err_out;

		}

skip_large_dir_stuff:
@@ -1430,6 +1432,7 @@ static int ntfs_read_locked_attr_inode(struct inode *base_vi, struct inode *vi) 
 */

static int ntfs_read_locked_index_inode(struct inode *base_vi, struct inode *vi)

{

	loff_t bvi_size;

	ntfs_volume *vol = NTFS_SB(vi->i_sb);

	ntfs_inode *ni, *base_ni, *bni;

	struct inode *bvi;
@@ -1633,10 +1636,10 @@ static int ntfs_read_locked_index_inode(struct inode *base_vi, struct inode *vi) 
		goto iput_unm_err_out;

	}

	/* Consistency check bitmap size vs. index allocation size. */

	if ((bvi->i_size << 3) < (vi->i_size >>

			ni->itype.index.block_size_bits)) {

	bvi_size = i_size_read(bvi);

	if ((bvi_size << 3) < (vi->i_size >> ni->itype.index.block_size_bits)) {

		ntfs_error(vi->i_sb, "Index bitmap too small (0x%llx) for "

				"index allocation (0x%llx).", bvi->i_size << 3,

				"index allocation (0x%llx).", bvi_size << 3,

				vi->i_size);

		goto iput_unm_err_out;

	}