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

Commit 6fdb702d authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Linus Torvalds
Browse files

ocfs2: call ocfs2_update_inode_fsync_trans when updating any inode 



Ensure that ocfs2_update_inode_fsync_trans() is called any time we touch
an inode in a given transaction.  This is a follow-on to the previous
patch to reduce lock contention and deadlocking during an fsync
operation.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Wengang <wen.gang.wang@oracle.com>
Cc: Greg Marsden <greg.marsden@oracle.com>
Cc: Srinivas Eeda <srinivas.eeda@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f81c2015

fs/ocfs2/acl.c

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ static int ocfs2_acl_set_mode(struct inode *inode, struct buffer_head *di_bh, 
	di->i_mode = cpu_to_le16(inode->i_mode);

	di->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);

	di->i_ctime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);

	ocfs2_update_inode_fsync_trans(handle, inode, 0);



	ocfs2_journal_dirty(handle, di_bh);

fs/ocfs2/alloc.c

+2 −0
Original line number Diff line number Diff line
@@ -5728,6 +5728,7 @@ int ocfs2_remove_btree_range(struct inode *inode, 
	}



	ocfs2_et_update_clusters(et, -len);

	ocfs2_update_inode_fsync_trans(handle, inode, 1);



	ocfs2_journal_dirty(handle, et->et_root_bh);
@@ -7209,6 +7210,7 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh, 
	di->i_ctime = di->i_mtime = cpu_to_le64(inode->i_ctime.tv_sec);

	di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);



	ocfs2_update_inode_fsync_trans(handle, inode, 1);

	ocfs2_journal_dirty(handle, di_bh);



out_commit:

fs/ocfs2/dir.c

+2 −0
Original line number Diff line number Diff line
@@ -3006,6 +3006,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 
	di->i_size = cpu_to_le64(sb->s_blocksize);

	di->i_ctime = di->i_mtime = cpu_to_le64(dir->i_ctime.tv_sec);

	di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(dir->i_ctime.tv_nsec);

	ocfs2_update_inode_fsync_trans(handle, dir, 1);



	/*

	 * This should never fail as our extent list is empty and all
@@ -4405,6 +4406,7 @@ static int ocfs2_dx_dir_remove_index(struct inode *dir, 
	di->i_dyn_features = cpu_to_le16(OCFS2_I(dir)->ip_dyn_features);

	spin_unlock(&OCFS2_I(dir)->ip_lock);

	di->i_dx_root = cpu_to_le64(0ULL);

	ocfs2_update_inode_fsync_trans(handle, dir, 1);



	ocfs2_journal_dirty(handle, di_bh);

fs/ocfs2/file.c

+7 −0
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ int ocfs2_update_inode_atime(struct inode *inode, 
	inode->i_atime = CURRENT_TIME;

	di->i_atime = cpu_to_le64(inode->i_atime.tv_sec);

	di->i_atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec);

	ocfs2_update_inode_fsync_trans(handle, inode, 0);

	ocfs2_journal_dirty(handle, bh);



out_commit:
@@ -335,6 +336,7 @@ int ocfs2_simple_size_update(struct inode *inode, 
	if (ret < 0)

		mlog_errno(ret);



	ocfs2_update_inode_fsync_trans(handle, inode, 0);

	ocfs2_commit_trans(osb, handle);

out:

	return ret;
@@ -429,6 +431,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb, 
	di->i_size = cpu_to_le64(new_i_size);

	di->i_ctime = di->i_mtime = cpu_to_le64(inode->i_ctime.tv_sec);

	di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);

	ocfs2_update_inode_fsync_trans(handle, inode, 0);



	ocfs2_journal_dirty(handle, fe_bh);
@@ -737,6 +740,7 @@ static handle_t *ocfs2_zero_start_ordered_transaction(struct inode *inode, 
				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret)

		mlog_errno(ret);

	ocfs2_update_inode_fsync_trans(handle, inode, 1);



out:

	if (ret) {
@@ -834,6 +838,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from, 
		di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);

		di->i_mtime_nsec = di->i_ctime_nsec;

		ocfs2_journal_dirty(handle, di_bh);

		ocfs2_update_inode_fsync_trans(handle, inode, 1);

		ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);

	}
@@ -1338,6 +1343,7 @@ static int __ocfs2_write_remove_suid(struct inode *inode, 


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

	di->i_mode = cpu_to_le16(inode->i_mode);

	ocfs2_update_inode_fsync_trans(handle, inode, 0);



	ocfs2_journal_dirty(handle, bh);
@@ -1570,6 +1576,7 @@ static int ocfs2_zero_partial_clusters(struct inode *inode, 
		if (ret)

			mlog_errno(ret);

	}

	ocfs2_update_inode_fsync_trans(handle, inode, 1);



	ocfs2_commit_trans(osb, handle);

out:

fs/ocfs2/move_extents.c

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ static int __ocfs2_move_extent(handle_t *handle, 
							old_blkno, len);

	}



	ocfs2_update_inode_fsync_trans(handle, inode, 0);

out:

	ocfs2_free_path(path);

	return ret;
@@ -957,6 +958,7 @@ static int ocfs2_move_extents(struct ocfs2_move_extents_context *context) 
	inode->i_ctime = CURRENT_TIME;

	di->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);

	di->i_ctime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);

	ocfs2_update_inode_fsync_trans(handle, inode, 0);



	ocfs2_journal_dirty(handle, di_bh);