xfs: take the ilock around xfs_bmapi_read in xfs_zero_remaining_bytes
authorChristoph Hellwig <hch@infradead.org>
Fri, 6 Dec 2013 20:30:12 +0000 (12:30 -0800)
committerBen Myers <bpm@sgi.com>
Wed, 18 Dec 2013 21:53:38 +0000 (15:53 -0600)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
fs/xfs/xfs_bmap_util.c

index 374ba05..202a51f 100644 (file)
@@ -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);