History

Merge tag 'for-6.2/block-2022-12-08' of git://git.kernel.dk/linux

Pull block updates from Jens Axboe: - NVMe pull requests via Christoph: - Support some passthrough commands without CAP_SYS_ADMIN (Kanchan Joshi) - Refactor PCIe probing and reset (Christoph Hellwig) - Various fabrics authentication fixes and improvements (Sagi Grimberg) - Avoid fallback to sequential scan due to transient issues (Uday Shankar) - Implement support for the DEAC bit in Write Zeroes (Christoph Hellwig) - Allow overriding the IEEE OUI and firmware revision in configfs for nvmet (Aleksandr Miloserdov) - Force reconnect when number of queue changes in nvmet (Daniel Wagner) - Minor fixes and improvements (Uros Bizjak, Joel Granados, Sagi Grimberg, Christoph Hellwig, Christophe JAILLET) - Fix and cleanup nvme-fc req allocation (Chaitanya Kulkarni) - Use the common tagset helpers in nvme-pci driver (Christoph Hellwig) - Cleanup the nvme-pci removal path (Christoph Hellwig) - Use kstrtobool() instead of strtobool (Christophe JAILLET) - Allow unprivileged passthrough of Identify Controller (Joel Granados) - Support io stats on the mpath device (Sagi Grimberg) - Minor nvmet cleanup (Sagi Grimberg) - MD pull requests via Song: - Code cleanups (Christoph) - Various fixes - Floppy pull request from Denis: - Fix a memory leak in the init error path (Yuan) - Series fixing some batch wakeup issues with sbitmap (Gabriel) - Removal of the pktcdvd driver that was deprecated more than 5 years ago, and subsequent removal of the devnode callback in struct block_device_operations as no users are now left (Greg) - Fix for partition read on an exclusively opened bdev (Jan) - Series of elevator API cleanups (Jinlong, Christoph) - Series of fixes and cleanups for blk-iocost (Kemeng) - Series of fixes and cleanups for blk-throttle (Kemeng) - Series adding concurrent support for sync queues in BFQ (Yu) - Series bringing drbd a bit closer to the out-of-tree maintained version (Christian, Joel, Lars, Philipp) - Misc drbd fixes (Wang) - blk-wbt fixes and tweaks for enable/disable (Yu) - Fixes for mq-deadline for zoned devices (Damien) - Add support for read-only and offline zones for null_blk (Shin'ichiro) - Series fixing the delayed holder tracking, as used by DM (Yu, Christoph) - Series enabling bio alloc caching for IRQ based IO (Pavel) - Series enabling userspace peer-to-peer DMA (Logan) - BFQ waker fixes (Khazhismel) - Series fixing elevator refcount issues (Christoph, Jinlong) - Series cleaning up references around queue destruction (Christoph) - Series doing quiesce by tagset, enabling cleanups in drivers (Christoph, Chao) - Series untangling the queue kobject and queue references (Christoph) - Misc fixes and cleanups (Bart, David, Dawei, Jinlong, Kemeng, Ye, Yang, Waiman, Shin'ichiro, Randy, Pankaj, Christoph) * tag 'for-6.2/block-2022-12-08' of git://git.kernel.dk/linux: (247 commits) blktrace: Fix output non-blktrace event when blk_classic option enabled block: sed-opal: Don't include <linux/kernel.h> sed-opal: allow using IOC_OPAL_SAVE for locking too blk-cgroup: Fix typo in comment block: remove bio_set_op_attrs nvmet: don't open-code NVME_NS_ATTR_RO enumeration nvme-pci: use the tagset alloc/free helpers nvme: add the Apple shared tag workaround to nvme_alloc_io_tag_set nvme: only set reserved_tags in nvme_alloc_io_tag_set for fabrics controllers nvme: consolidate setting the tagset flags nvme: pass nr_maps explicitly to nvme_alloc_io_tag_set block: bio_copy_data_iter nvme-pci: split out a nvme_pci_ctrl_is_dead helper nvme-pci: return early on ctrl state mismatch in nvme_reset_work nvme-pci: rename nvme_disable_io_queues nvme-pci: cleanup nvme_suspend_queue nvme-pci: remove nvme_pci_disable nvme-pci: remove nvme_disable_admin_queue nvme: merge nvme_shutdown_ctrl into nvme_disable_ctrl nvme: use nvme_wait_ready in nvme_shutdown_ctrl ...

Linus Torvalds committed 3 years ago

Commit ce8a79d2 parents 96f7e44 f596da3144 files · +3229 −5907Browse files

Showing the changes to include/uapi/linux (2 of 144 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/pktcdvd.h +0 −112
  2. include/uapi/linux/sed-opal.h +7 −1
include/uapi/linux/pktcdvd.h+0−112
@@ -1,112 +0,0 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2/*
3 * Copyright (C) 2000 Jens Axboe <axboe@suse.de>
4 * Copyright (C) 2001-2004 Peter Osterlund <petero2@telia.com>
5 *
6 * May be copied or modified under the terms of the GNU General Public
7 * License. See linux/COPYING for more information.
8 *
9 * Packet writing layer for ATAPI and SCSI CD-R, CD-RW, DVD-R, and
10 * DVD-RW devices.
11 *
12 */
13#ifndef _UAPI__PKTCDVD_H
14#define _UAPI__PKTCDVD_H
15
16#include <linux/types.h>
17
18/*
19 * 1 for normal debug messages, 2 is very verbose. 0 to turn it off.
20 */
21#define PACKET_DEBUG 1
22
23#define MAX_WRITERS 8
24
25#define PKT_RB_POOL_SIZE 512
26
27/*
28 * How long we should hold a non-full packet before starting data gathering.
29 */
30#define PACKET_WAIT_TIME (HZ * 5 / 1000)
31
32/*
33 * use drive write caching -- we need deferred error handling to be
34 * able to successfully recover with this option (drive will return good
35 * status as soon as the cdb is validated).
36 */
37#if defined(CONFIG_CDROM_PKTCDVD_WCACHE)
38#define USE_WCACHING 1
39#else
40#define USE_WCACHING 0
41#endif
42
43/*
44 * No user-servicable parts beyond this point ->
45 */
46
47/*
48 * device types
49 */
50#define PACKET_CDR 1
51#define PACKET_CDRW 2
52#define PACKET_DVDR 3
53#define PACKET_DVDRW 4
54
55/*
56 * flags
57 */
58#define PACKET_WRITABLE 1 /* pd is writable */
59#define PACKET_NWA_VALID 2 /* next writable address valid */
60#define PACKET_LRA_VALID 3 /* last recorded address valid */
61#define PACKET_MERGE_SEGS 4 /* perform segment merging to keep */
62 /* underlying cdrom device happy */
63
64/*
65 * Disc status -- from READ_DISC_INFO
66 */
67#define PACKET_DISC_EMPTY 0
68#define PACKET_DISC_INCOMPLETE 1
69#define PACKET_DISC_COMPLETE 2
70#define PACKET_DISC_OTHER 3
71
72/*
73 * write type, and corresponding data block type
74 */
75#define PACKET_MODE1 1
76#define PACKET_MODE2 2
77#define PACKET_BLOCK_MODE1 8
78#define PACKET_BLOCK_MODE2 10
79
80/*
81 * Last session/border status
82 */
83#define PACKET_SESSION_EMPTY 0
84#define PACKET_SESSION_INCOMPLETE 1
85#define PACKET_SESSION_RESERVED 2
86#define PACKET_SESSION_COMPLETE 3
87
88#define PACKET_MCN "4a656e734178626f65323030300000"
89
90#undef PACKET_USE_LS
91
92#define PKT_CTRL_CMD_SETUP 0
93#define PKT_CTRL_CMD_TEARDOWN 1
94#define PKT_CTRL_CMD_STATUS 2
95
96struct pkt_ctrl_command {
97 __u32 command; /* in: Setup, teardown, status */
98 __u32 dev_index; /* in/out: Device index */
99 __u32 dev; /* in/out: Device nr for cdrw device */
100 __u32 pkt_dev; /* in/out: Device nr for packet device */
101 __u32 num_devices; /* out: Largest device index + 1 */
102 __u32 padding; /* Not used */
103};
104
105/*
106 * packet ioctls
107 */
108#define PACKET_IOCTL_MAGIC ('X')
109#define PACKET_CTRL_CMD _IOWR(PACKET_IOCTL_MAGIC, 1, struct pkt_ctrl_command)
110
111
112#endif /* _UAPI__PKTCDVD_H */
include/uapi/linux/sed-opal.h+7−1
@@ -44,6 +44,11 @@ enum opal_lock_state { · 43 unmodified lines
44 OPAL_LK = 0x04, /* 0100 */44 OPAL_LK = 0x04, /* 0100 */
45};45};
46 46
47enum opal_lock_flags {
48 /* IOC_OPAL_SAVE will also store the provided key for locking */
49 OPAL_SAVE_FOR_LOCK = 0x01,
50};
51
47struct opal_key {52struct opal_key {
48 __u8 lr;53 __u8 lr;
49 __u8 key_len;54 __u8 key_len;
@@ -76,7 +81,8 @@ struct opal_user_lr_setup { · 26 unmodified lines
76struct opal_lock_unlock {81struct opal_lock_unlock {
77 struct opal_session_info session;82 struct opal_session_info session;
78 __u32 l_state;83 __u32 l_state;
79 __u8 __align[4];84 __u16 flags;
85 __u8 __align[2];
80};86};
81 87
82struct opal_new_pw {88struct opal_new_pw {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t