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

Commit f17c20dd authored by Junxiao Bi's avatar Junxiao Bi Committed by Linus Torvalds
Browse files

ocfs2: use i_size_read() to access i_size 



Though ocfs2 uses inode->i_mutex to protect i_size, there are both
i_size_read/write() and direct accesses.  Clean up all direct access to
eliminate confusion.

Signed-off-by: default avatarJunxiao Bi <junxiao.bi@oracle.com>
Cc: Jie Liu <jeff.liu@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2b1e55c3

fs/ocfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -2044,7 +2044,7 @@ int ocfs2_write_end_nolock(struct address_space *mapping, 


out_write_size:

	pos += copied;

	if (pos > inode->i_size) {

	if (pos > i_size_read(inode)) {

		i_size_write(inode, pos);

		mark_inode_dirty(inode);

	}

fs/ocfs2/extent_map.c

+5 −5
Original line number Diff line number Diff line
@@ -852,20 +852,20 @@ int ocfs2_seek_data_hole_offset(struct file *file, loff_t *offset, int whence) 


	down_read(&OCFS2_I(inode)->ip_alloc_sem);



	if (*offset >= inode->i_size) {

	if (*offset >= i_size_read(inode)) {

		ret = -ENXIO;

		goto out_unlock;

	}



	if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) {

		if (whence == SEEK_HOLE)

			*offset = inode->i_size;

			*offset = i_size_read(inode);

		goto out_unlock;

	}



	clen = 0;

	cpos = *offset >> cs_bits;

	cend = ocfs2_clusters_for_bytes(inode->i_sb, inode->i_size);

	cend = ocfs2_clusters_for_bytes(inode->i_sb, i_size_read(inode));



	while (cpos < cend && !is_last) {

		ret = ocfs2_get_clusters_nocache(inode, di_bh, cpos, &hole_size,
@@ -904,8 +904,8 @@ int ocfs2_seek_data_hole_offset(struct file *file, loff_t *offset, int whence) 
		extlen = clen;

		extlen <<=  cs_bits;



		if ((extoff + extlen) > inode->i_size)

			extlen = inode->i_size - extoff;

		if ((extoff + extlen) > i_size_read(inode))

			extlen = i_size_read(inode) - extoff;

		extoff += extlen;

		if (extoff > *offset)

			*offset = extoff;

fs/ocfs2/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ int ocfs2_info_handle_journal_size(struct inode *inode, 
	if (o2info_from_user(oij, req))

		goto bail;



	oij.ij_journal_size = osb->journal->j_inode->i_size;

	oij.ij_journal_size = i_size_read(osb->journal->j_inode);



	o2info_set_request_filled(&oij.ij_req);

fs/ocfs2/journal.c

+4 −4
Original line number Diff line number Diff line
@@ -836,14 +836,14 @@ int ocfs2_journal_init(struct ocfs2_journal *journal, int *dirty) 
	inode_lock = 1;

	di = (struct ocfs2_dinode *)bh->b_data;



	if (inode->i_size <  OCFS2_MIN_JOURNAL_SIZE) {

	if (i_size_read(inode) <  OCFS2_MIN_JOURNAL_SIZE) {

		mlog(ML_ERROR, "Journal file size (%lld) is too small!\n",

		     inode->i_size);

		     i_size_read(inode));

		status = -EINVAL;

		goto done;

	}



	trace_ocfs2_journal_init(inode->i_size,

	trace_ocfs2_journal_init(i_size_read(inode),

				 (unsigned long long)inode->i_blocks,

				 OCFS2_I(inode)->ip_clusters);
@@ -1131,7 +1131,7 @@ static int ocfs2_force_read_journal(struct inode *inode) 


	memset(bhs, 0, sizeof(struct buffer_head *) * CONCURRENT_JOURNAL_FILL);



	num_blocks = ocfs2_blocks_for_bytes(inode->i_sb, inode->i_size);

	num_blocks = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode));

	v_blkno = 0;

	while (v_blkno < num_blocks) {

		status = ocfs2_extent_map_get_blocks(inode, v_blkno,

fs/ocfs2/move_extents.c

+1 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ static int __ocfs2_move_extents_range(struct buffer_head *di_bh, 
	struct ocfs2_move_extents *range = context->range;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);



	if ((inode->i_size == 0) || (range->me_len == 0))

	if ((i_size_read(inode) == 0) || (range->me_len == 0))

		return 0;



	if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL)