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

Commit 37a8d89a authored by Joseph Qi's avatar Joseph Qi Committed by Linus Torvalds
Browse files

ocfs2: take inode lock when get clusters 



We need take inode lock when calling ocfs2_get_clusters.
And use GFP_NOFS instead of GFP_KERNEL.

Signed-off-by: default avatarJoseph Qi <joseph.qi@huawei.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 7e9b1955

fs/ocfs2/aops.c

+10 −1
Original line number Diff line number Diff line
@@ -772,10 +772,17 @@ static ssize_t ocfs2_direct_IO_write(struct kiocb *iocb, 
		u32 p_cpos = 0;

		u32 v_cpos = ocfs2_bytes_to_clusters(osb->sb, offset);



		ret = ocfs2_inode_lock(inode, NULL, 0);

		if (ret < 0) {

			mlog_errno(ret);

			goto clean_orphan;

		}



		ret = ocfs2_get_clusters(inode, v_cpos, &p_cpos,

				&num_clusters, &ext_flags);

		if (ret < 0) {

			mlog_errno(ret);

			ocfs2_inode_unlock(inode, 0);

			goto clean_orphan;

		}
@@ -783,9 +790,11 @@ static ssize_t ocfs2_direct_IO_write(struct kiocb *iocb, 


		ret = blkdev_issue_zeroout(osb->sb->s_bdev,

				p_cpos << (osb->s_clustersize_bits - 9),

				zero_len >> 9, GFP_KERNEL, false);

				zero_len >> 9, GFP_NOFS, false);

		if (ret < 0)

			mlog_errno(ret);



		ocfs2_inode_unlock(inode, 0);

	}



clean_orphan: