Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-block

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / fs / xfs / xfs_aops.c

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 71c8c9d2b8826a0ed22d886fb3327d2ff0784fc3..db2cfb067d0b1ea88f8b64875ceb174d3ae582d2 100644 (file)
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -407,7 +407,7 @@ xfs_alloc_ioend_bio(
        struct bio              *bio = bio_alloc(GFP_NOIO, nvecs);
 
        ASSERT(bio->bi_private == NULL);
-       bio->bi_sector = bh->b_blocknr * (bh->b_size >> 9);
+       bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
        bio->bi_bdev = bh->b_bdev;
        return bio;
 }
@@ -1217,7 +1217,7 @@ __xfs_get_blocks(
                lockmode = XFS_ILOCK_EXCL;
                xfs_ilock(ip, lockmode);
        } else {
-               lockmode = xfs_ilock_map_shared(ip);
+               lockmode = xfs_ilock_data_map_shared(ip);
        }
 
        ASSERT(offset <= mp->m_super->s_maxbytes);