Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
93689a60
Commit
93689a60
authored
Oct 27, 2017
by
Jens Axboe
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'nvme-4.14' of
git://git.infradead.org/nvme
into for-linus
Pull an NVMe fix from Christoph.
parents
15f859ae
7db81446
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
drivers/nvme/host/rdma.c
drivers/nvme/host/rdma.c
+7
-4
No files found.
drivers/nvme/host/rdma.c
View file @
93689a60
...
@@ -1614,12 +1614,15 @@ nvme_rdma_queue_is_ready(struct nvme_rdma_queue *queue, struct request *rq)
...
@@ -1614,12 +1614,15 @@ nvme_rdma_queue_is_ready(struct nvme_rdma_queue *queue, struct request *rq)
/*
/*
* reconnecting state means transport disruption, which
* reconnecting state means transport disruption, which
* can take a long time and even might fail permanently,
* can take a long time and even might fail permanently,
*
so we can't let incoming I/O be requeued fore
ver.
*
fail fast to give upper layers a chance to failo
ver.
*
fail it fast to allow upper layers a chance to
*
deleting state means that the ctrl will never accept
*
failover
.
*
commands again, fail it permanently
.
*/
*/
if
(
queue
->
ctrl
->
ctrl
.
state
==
NVME_CTRL_RECONNECTING
)
if
(
queue
->
ctrl
->
ctrl
.
state
==
NVME_CTRL_RECONNECTING
||
queue
->
ctrl
->
ctrl
.
state
==
NVME_CTRL_DELETING
)
{
nvme_req
(
rq
)
->
status
=
NVME_SC_ABORT_REQ
;
return
BLK_STS_IOERR
;
return
BLK_STS_IOERR
;
}
return
BLK_STS_RESOURCE
;
/* try again later */
return
BLK_STS_RESOURCE
;
/* try again later */
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment