Merge tag 'for-linus-2019-10-18' of git://git.kernel.dk/linux-block

[linux.git] / fs / xfs / xfs_itable.c

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index f5c955d35be4342467815f45ce49b02a89813931..884950adbd16470b35467ac4731445b024b8cc1f 100644 (file)
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -137,7 +137,7 @@ xfs_bulkstat_one_int(
        xfs_irele(ip);
 
        error = bc->formatter(bc->breq, buf);
-       if (error == XFS_IBULK_ABORT)
+       if (error == -ECANCELED)
                goto out_advance;
        if (error)
                goto out;
@@ -169,7 +169,7 @@ xfs_bulkstat_one(
        ASSERT(breq->icount == 1);
 
        bc.buf = kmem_zalloc(sizeof(struct xfs_bulkstat),
-                       KM_SLEEP | KM_MAYFAIL);
+                       KM_MAYFAIL);
        if (!bc.buf)
                return -ENOMEM;
 
@@ -181,7 +181,7 @@ xfs_bulkstat_one(
         * If we reported one inode to userspace then we abort because we hit
         * the end of the buffer.  Don't leak that back to userspace.
         */
-       if (error == XFS_IWALK_ABORT)
+       if (error == -ECANCELED)
                error = 0;
 
        return error;
@@ -243,7 +243,7 @@ xfs_bulkstat(
                return 0;
 
        bc.buf = kmem_zalloc(sizeof(struct xfs_bulkstat),
-                       KM_SLEEP | KM_MAYFAIL);
+                       KM_MAYFAIL);
        if (!bc.buf)
                return -ENOMEM;
 
@@ -342,7 +342,7 @@ xfs_inumbers_walk(
        int                     error;
 
        error = ic->formatter(ic->breq, &inogrp);
-       if (error && error != XFS_IBULK_ABORT)
+       if (error && error != -ECANCELED)
                return error;
 
        ic->breq->startino = XFS_AGINO_TO_INO(mp, agno, irec->ir_startino) +