From: Christoph Hellwig <hch@infradead.org>
Date: Fri, 6 Dec 2013 20:30:12 +0000 (-0800)
Subject: xfs: take the ilock around xfs_bmapi_read in xfs_zero_remaining_bytes
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4f317369d46956ccd76b5d28cf66b3f8b24f3480;p=deliverable%2Flinux.git

xfs: take the ilock around xfs_bmapi_read in xfs_zero_remaining_bytes

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
---

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 374ba050942f..202a51f7c450 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1173,9 +1173,15 @@ xfs_zero_remaining_bytes(
 	xfs_buf_unlock(bp);
 
 	for (offset = startoff; offset <= endoff; offset = lastoffset + 1) {
+		uint lock_mode;
+
 		offset_fsb = XFS_B_TO_FSBT(mp, offset);
 		nimap = 1;
+
+		lock_mode = xfs_ilock_data_map_shared(ip);
 		error = xfs_bmapi_read(ip, offset_fsb, 1, &imap, &nimap, 0);
+		xfs_iunlock(ip, lock_mode);
+
 		if (error || nimap < 1)
 			break;
 		ASSERT(imap.br_blockcount >= 1);