History

Merge branch 'for-6.12/block' into for-6.12/io_uring-discard

* for-6.12/block: (115 commits) block: unpin user pages belonging to a folio at once mm: release number of pages of a folio block: introduce folio awareness and add a bigger size from folio block: Added folio-ized version of bio_add_hw_page() block, bfq: factor out a helper to split bfqq in bfq_init_rq() block, bfq: remove local variable 'bfqq_already_existing' in bfq_init_rq() block, bfq: remove local variable 'split' in bfq_init_rq() block, bfq: remove bfq_log_bfqg() block, bfq: merge bfq_release_process_ref() into bfq_put_cooperator() block, bfq: fix procress reference leakage for bfqq in merge chain block, bfq: fix uaf for accessing waker_bfqq after splitting blk-throttle: support prioritized processing of metadata blk-throttle: remove last_low_overflow_time drbd: Add NULL check for net_conf to prevent dereference in state validation blk-mq: add missing unplug trace event mtip32xx: Remove redundant null pointer checks in mtip_hw_debugfs_init() md: Add new_level sysfs interface zram: Shrink zram_table_entry::flags. zram: Remove ZRAM_LOCK zram: Replace bit spinlocks with a spinlock_t. ...

Jens Axboe committed 2 years ago

Commit 318ad422 parents bc83b4d eb1d46f62 files · +1689 −1286Browse files

Showing the changes to include/uapi (1 of 62 files). Show all

Unified · Split

include/uapi/linux/nbd.h+6−2
@@ -42,8 +42,9 @@ enum { · 41 unmodified lines
42 NBD_CMD_WRITE = 1,42 NBD_CMD_WRITE = 1,
43 NBD_CMD_DISC = 2,43 NBD_CMD_DISC = 2,
44 NBD_CMD_FLUSH = 3,44 NBD_CMD_FLUSH = 3,
45 NBD_CMD_TRIM = 445 NBD_CMD_TRIM = 4,
46 /* userspace defines additional extension commands */46 /* userspace defines additional extension commands */
47 NBD_CMD_WRITE_ZEROES = 6,
47};48};
48 49
49/* values for flags field, these are server interaction specific. */50/* values for flags field, these are server interaction specific. */
@@ -51,12 +52,15 @@ enum { · 1 unmodified line
51#define NBD_FLAG_READ_ONLY (1 << 1) /* device is read-only */52#define NBD_FLAG_READ_ONLY (1 << 1) /* device is read-only */
52#define NBD_FLAG_SEND_FLUSH (1 << 2) /* can flush writeback cache */53#define NBD_FLAG_SEND_FLUSH (1 << 2) /* can flush writeback cache */
53#define NBD_FLAG_SEND_FUA (1 << 3) /* send FUA (forced unit access) */54#define NBD_FLAG_SEND_FUA (1 << 3) /* send FUA (forced unit access) */
54/* there is a gap here to match userspace */55#define NBD_FLAG_ROTATIONAL (1 << 4) /* device is rotational */
55#define NBD_FLAG_SEND_TRIM (1 << 5) /* send trim/discard */56#define NBD_FLAG_SEND_TRIM (1 << 5) /* send trim/discard */
57#define NBD_FLAG_SEND_WRITE_ZEROES (1 << 6) /* supports WRITE_ZEROES */
58/* there is a gap here to match userspace */
56#define NBD_FLAG_CAN_MULTI_CONN (1 << 8) /* Server supports multiple connections per export. */59#define NBD_FLAG_CAN_MULTI_CONN (1 << 8) /* Server supports multiple connections per export. */
57 60
58/* values for cmd flags in the upper 16 bits of request type */61/* values for cmd flags in the upper 16 bits of request type */
59#define NBD_CMD_FLAG_FUA (1 << 16) /* FUA (forced unit access) op */62#define NBD_CMD_FLAG_FUA (1 << 16) /* FUA (forced unit access) op */
63#define NBD_CMD_FLAG_NO_HOLE (1 << 17) /* Do not punch a hole for WRITE_ZEROES */
60 64
61/* These are client behavior specific flags. */65/* These are client behavior specific flags. */
62#define NBD_CFLAG_DESTROY_ON_DISCONNECT (1 << 0) /* delete the nbd device on66#define NBD_CFLAG_DESTROY_ON_DISCONNECT (1 << 0) /* delete the nbd device on

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