Merge tag 'nfs-for-6.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[platform/kernel/linux-starfive.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 3fc68b9..99d8b98 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -155,7 +155,7 @@ static const struct {
        [BLK_STS_NOSPC]         = { -ENOSPC,    "critical space allocation" },
        [BLK_STS_TRANSPORT]     = { -ENOLINK,   "recoverable transport" },
        [BLK_STS_TARGET]        = { -EREMOTEIO, "critical target" },
-       [BLK_STS_NEXUS]         = { -EBADE,     "critical nexus" },
+       [BLK_STS_RESV_CONFLICT] = { -EBADE,     "reservation conflict" },
        [BLK_STS_MEDIUM]        = { -ENODATA,   "critical medium" },
        [BLK_STS_PROTECTION]    = { -EILSEQ,    "protection" },
        [BLK_STS_RESOURCE]      = { -ENOMEM,    "kernel resource" },
@@ -170,6 +170,9 @@ static const struct {
        [BLK_STS_ZONE_OPEN_RESOURCE]    = { -ETOOMANYREFS, "open zones exceeded" },
        [BLK_STS_ZONE_ACTIVE_RESOURCE]  = { -EOVERFLOW, "active zones exceeded" },
 
+       /* Command duration limit device-side timeout */
+       [BLK_STS_DURATION_LIMIT]        = { -ETIME, "duration limit exceeded" },
+
        /* everything else not covered above: */
        [BLK_STS_IOERR]         = { -EIO,       "I/O" },
 };