diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-07 16:45:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-07 16:45:48 -0700 |
| commit | 602079a0a13c69d190e16297d123ad3d279364e5 (patch) | |
| tree | 0fda3276365ec9a697389f341f5086573bc20fc7 /drivers/nvme/host/pr.c | |
| parent | e33915892d8871b28d17675fecc1b5b36b0d5721 (diff) | |
| parent | 27d024235bdb16af917809d33916392452c3ac85 (diff) | |
Merge tag 'block-6.10-20240607' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
- Fix for null_blk block size validation (Andreas)
- NVMe pull request via Keith:
- Use reserved tags for special fabrics operations (Chunguang)
- Persistent Reservation status masking fix (Weiwen)
* tag 'block-6.10-20240607' of git://git.kernel.dk/linux:
null_blk: fix validation of block size
nvme: fix nvme_pr_* status code parsing
nvme-fabrics: use reserved tag for reg read/write command
Diffstat (limited to 'drivers/nvme/host/pr.c')
| -rw-r--r-- | drivers/nvme/host/pr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/pr.c b/drivers/nvme/host/pr.c index e05571b2a1b0..8fa1ffcdaed4 100644 --- a/drivers/nvme/host/pr.c +++ b/drivers/nvme/host/pr.c @@ -77,7 +77,7 @@ static int nvme_sc_to_pr_err(int nvme_sc) if (nvme_is_path_error(nvme_sc)) return PR_STS_PATH_FAILED; - switch (nvme_sc) { + switch (nvme_sc & 0x7ff) { case NVME_SC_SUCCESS: return PR_STS_SUCCESS; case NVME_SC_RESERVATION_CONFLICT: |