Merge tag 'xfs-4.13-merge-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
[muen/linux.git] / fs / xfs / xfs_iomap.c
index 05dc87e8c1f59596f671cbc977ed6c9333b67adb..813394c62849727ddd4a5f97c5aa9041b6bc6987 100644 (file)
@@ -543,7 +543,7 @@ xfs_file_iomap_begin_delay(
        if (unlikely(XFS_TEST_ERROR(
            (XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_EXTENTS &&
             XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_BTREE),
-            mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {
+            mp, XFS_ERRTAG_BMAPIFORMAT))) {
                XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);
                error = -EFSCORRUPTED;
                goto out_unlock;
@@ -1119,7 +1119,7 @@ xfs_file_iomap_end_delalloc(
         * Behave as if the write failed if drop writes is enabled. Set the NEW
         * flag to force delalloc cleanup.
         */
-       if (xfs_mp_drop_writes(mp)) {
+       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_DROP_WRITES)) {
                iomap->flags |= IOMAP_F_NEW;
                written = 0;
        }