History

Merge tag 'for-5.18/drivers-2022-04-01' of git://git.kernel.dk/linux-block

Pull block driver fixes from Jens Axboe: "Followup block driver updates and fixes for the 5.18-rc1 merge window. In detail: - NVMe pull request - Fix multipath hang when disk goes live over reconnect (Anton Eidelman) - fix RCU hole that allowed for endless looping in multipath round robin (Chris Leech) - remove redundant assignment after left shift (Colin Ian King) - add quirks for Samsung X5 SSDs (Monish Kumar R) - fix the read-only state for zoned namespaces with unsupposed features (Pankaj Raghav) - use a private workqueue instead of the system workqueue in nvmet (Sagi Grimberg) - allow duplicate NSIDs for private namespaces (Sungup Moon) - expose use_threaded_interrupts read-only in sysfs (Xin Hao)" - nbd minor allocation fix (Zhang) - drbd fixes and maintainer addition (Lars, Jakob, Christoph) - n64cart build fix (Jackie) - loop compat ioctl fix (Carlos) - misc fixes (Colin, Dongli)" * tag 'for-5.18/drivers-2022-04-01' of git://git.kernel.dk/linux-block: drbd: remove check of list iterator against head past the loop body drbd: remove usage of list iterator variable after loop nbd: fix possible overflow on 'first_minor' in nbd_dev_add() MAINTAINERS: add drbd co-maintainer drbd: fix potential silent data corruption loop: fix ioctl calls using compat_loop_info nvme-multipath: fix hang when disk goes live over reconnect nvme: fix RCU hole that allowed for endless looping in multipath round robin nvme: allow duplicate NSIDs for private namespaces nvmet: remove redundant assignment after left shift nvmet: use a private workqueue instead of the system workqueue nvme-pci: add quirks for Samsung X5 SSDs nvme-pci: expose use_threaded_interrupts read-only in sysfs nvme: fix the read-only state for zoned namespaces with unsupposed features n64cart: convert bi_disk to bi_bdev->bd_disk fix build xen/blkfront: fix comment for need_copy xen-blkback: remove redundant assignment to variable i

Linus Torvalds committed 4 years ago

Commit 8467b0e2 parents d589ae0 2651ee525 files · +186 −92Browse files

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

Unified · Split

include/uapi/linux/loop.h+2−2
@@ -45,7 +45,7 @@ struct loop_info { · 44 unmodified lines
4545 unsigned long lo_inode; /* ioctl r/o */
4646 __kernel_old_dev_t lo_rdevice; /* ioctl r/o */
4747 int lo_offset;
48− int lo_encrypt_type;
48+ int lo_encrypt_type; /* obsolete, ignored */
4949 int lo_encrypt_key_size; /* ioctl w/o */
5050 int lo_flags;
5151 char lo_name[LO_NAME_SIZE];
@@ -61,7 +61,7 @@ struct loop_info64 { · 9 unmodified lines
6161 __u64 lo_offset;
6262 __u64 lo_sizelimit;/* bytes, 0 == max available */
6363 __u32 lo_number; /* ioctl r/o */
64− __u32 lo_encrypt_type;
64+ __u32 lo_encrypt_type; /* obsolete, ignored */
6565 __u32 lo_encrypt_key_size; /* ioctl w/o */
6666 __u32 lo_flags;
6767 __u8 lo_file_name[LO_NAME_SIZE];

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