Merge tag 'for-5.13/drivers-2021-04-27' of git://git.kernel.dk/linux-block
Pull block driver updates from Jens Axboe:
- MD changes via Song:
- raid5 POWER fix
- raid1 failure fix
- UAF fix for md cluster
- mddev_find_or_alloc() clean up
- Fix NULL pointer deref with external bitmap
- Performance improvement for raid10 discard requests
- Fix missing information of /proc/mdstat
- rsxx const qualifier removal (Arnd)
- Expose allocated brd pages (Calvin)
- rnbd via Gioh Kim:
- Change maintainer
- Change domain address of maintainers' email
- Add polling IO mode and document update
- Fix memory leak and some bug detected by static code analysis
tools
- Code refactoring
- Series of floppy cleanups/fixes (Denis)
- s390 dasd fixes (Julian)
- kerneldoc fixes (Lee)
- null_blk double free (Lv)
- null_blk virtual boundary addition (Max)
- Remove xsysace driver (Michal)
- umem driver removal (Davidlohr)
- ataflop fixes (Dan)
- Revalidate disk removal (Christoph)
- Bounce buffer cleanups (Christoph)
- Mark lightnvm as deprecated (Christoph)
- mtip32xx init cleanups (Shixin)
- Various fixes (Tian, Gustavo, Coly, Yang, Zhang, Zhiqiang)
* tag 'for-5.13/drivers-2021-04-27' of git://git.kernel.dk/linux-block: (143 commits)
async_xor: increase src_offs when dropping destination page
drivers/block/null_blk/main: Fix a double free in null_init.
md/raid1: properly indicate failure when ending a failed write request
md-cluster: fix use-after-free issue when removing rdev
nvme: introduce generic per-namespace chardev
nvme: cleanup nvme_configure_apst
nvme: do not try to reconfigure APST when the controller is not live
nvme: add 'kato' sysfs attribute
nvme: sanitize KATO setting
nvmet: avoid queuing keep-alive timer if it is disabled
brd: expose number of allocated pages in debugfs
ataflop: fix off by one in ataflop_probe()
ataflop: potential out of bounds in do_format()
drbd: Fix fall-through warnings for Clang
block/rnbd: Use strscpy instead of strlcpy
block/rnbd-clt-sysfs: Remove copy buffer overlap in rnbd_clt_get_path_name
block/rnbd-clt: Remove max_segment_size
block/rnbd-clt: Generate kobject_uevent when the rnbd device state changes
block/rnbd-srv: Remove unused arguments of rnbd_srv_rdma_ev
Documentation/ABI/rnbd-clt: Add description for nr_poll_queues
...
This commit is contained in:
Linus Torvalds
+23
-23
@@ -49,11 +49,11 @@ struct floppy_struct {
|
||||
#define FDCLRPRM _IO(2, 0x41)
|
||||
/* clear user-defined parameters */
|
||||
|
||||
#define FDSETPRM _IOW(2, 0x42, struct floppy_struct)
|
||||
#define FDSETPRM _IOW(2, 0x42, struct floppy_struct)
|
||||
#define FDSETMEDIAPRM FDSETPRM
|
||||
/* set user-defined parameters for current media */
|
||||
|
||||
#define FDDEFPRM _IOW(2, 0x43, struct floppy_struct)
|
||||
#define FDDEFPRM _IOW(2, 0x43, struct floppy_struct)
|
||||
#define FDGETPRM _IOR(2, 0x04, struct floppy_struct)
|
||||
#define FDDEFMEDIAPRM FDDEFPRM
|
||||
#define FDGETMEDIAPRM FDGETPRM
|
||||
@@ -65,7 +65,7 @@ struct floppy_struct {
|
||||
/* issue/don't issue kernel messages on media type change */
|
||||
|
||||
|
||||
/*
|
||||
/*
|
||||
* Formatting (obsolete)
|
||||
*/
|
||||
#define FD_FILL_BYTE 0xF6 /* format fill byte. */
|
||||
@@ -126,13 +126,13 @@ typedef char floppy_drive_name[16];
|
||||
*/
|
||||
struct floppy_drive_params {
|
||||
signed char cmos; /* CMOS type */
|
||||
|
||||
/* Spec2 is (HLD<<1 | ND), where HLD is head load time (1=2ms, 2=4 ms
|
||||
|
||||
/* Spec2 is (HLD<<1 | ND), where HLD is head load time (1=2ms, 2=4 ms
|
||||
* etc) and ND is set means no DMA. Hardcoded to 6 (HLD=6ms, use DMA).
|
||||
*/
|
||||
unsigned long max_dtr; /* Step rate, usec */
|
||||
unsigned long hlt; /* Head load/settle time, msec */
|
||||
unsigned long hut; /* Head unload time (remnant of
|
||||
unsigned long hut; /* Head unload time (remnant of
|
||||
* 8" drives) */
|
||||
unsigned long srt; /* Step rate, usec */
|
||||
|
||||
@@ -145,12 +145,12 @@ struct floppy_drive_params {
|
||||
unsigned char rps; /* rotations per second */
|
||||
unsigned char tracks; /* maximum number of tracks */
|
||||
unsigned long timeout; /* timeout for interrupt requests */
|
||||
|
||||
unsigned char interleave_sect; /* if there are more sectors, use
|
||||
|
||||
unsigned char interleave_sect; /* if there are more sectors, use
|
||||
* interleave */
|
||||
|
||||
|
||||
struct floppy_max_errors max_errors;
|
||||
|
||||
|
||||
char flags; /* various flags, including ftd_msg */
|
||||
/*
|
||||
* Announce successful media type detection and media information loss after
|
||||
@@ -162,7 +162,7 @@ struct floppy_drive_params {
|
||||
#define FD_BROKEN_DCL 0x20
|
||||
#define FD_DEBUG 0x02
|
||||
#define FD_SILENT_DCL_CLEAR 0x4
|
||||
#define FD_INVERTED_DCL 0x80 /* must be 0x80, because of hardware
|
||||
#define FD_INVERTED_DCL 0x80 /* must be 0x80, because of hardware
|
||||
considerations */
|
||||
|
||||
char read_track; /* use readtrack during probing? */
|
||||
@@ -176,8 +176,8 @@ struct floppy_drive_params {
|
||||
#define FD_AUTODETECT_SIZE 8
|
||||
|
||||
short autodetect[FD_AUTODETECT_SIZE]; /* autodetected formats */
|
||||
|
||||
int checkfreq; /* how often should the drive be checked for disk
|
||||
|
||||
int checkfreq; /* how often should the drive be checked for disk
|
||||
* changes */
|
||||
int native_format; /* native format of this drive */
|
||||
};
|
||||
@@ -225,13 +225,13 @@ struct floppy_drive_struct {
|
||||
* decremented after each probe.
|
||||
*/
|
||||
int keep_data;
|
||||
|
||||
|
||||
/* Prevent "aliased" accesses. */
|
||||
int fd_ref;
|
||||
int fd_device;
|
||||
unsigned long last_checked; /* when was the drive last checked for a disk
|
||||
unsigned long last_checked; /* when was the drive last checked for a disk
|
||||
* change? */
|
||||
|
||||
|
||||
char *dmabuf;
|
||||
int bufblocks;
|
||||
};
|
||||
@@ -255,7 +255,7 @@ enum reset_mode {
|
||||
/*
|
||||
* FDC state
|
||||
*/
|
||||
struct floppy_fdc_state {
|
||||
struct floppy_fdc_state {
|
||||
int spec1; /* spec1 value last used */
|
||||
int spec2; /* spec2 value last used */
|
||||
int dtr;
|
||||
@@ -302,16 +302,16 @@ struct floppy_write_errors {
|
||||
* to the user process are not counted.
|
||||
*/
|
||||
|
||||
unsigned int write_errors; /* number of physical write errors
|
||||
unsigned int write_errors; /* number of physical write errors
|
||||
* encountered */
|
||||
|
||||
|
||||
/* position of first and last write errors */
|
||||
unsigned long first_error_sector;
|
||||
int first_error_generation;
|
||||
unsigned long last_error_sector;
|
||||
int last_error_generation;
|
||||
|
||||
unsigned int badness; /* highest retry count for a read or write
|
||||
|
||||
unsigned int badness; /* highest retry count for a read or write
|
||||
* operation */
|
||||
};
|
||||
|
||||
@@ -335,7 +335,7 @@ struct floppy_raw_cmd {
|
||||
#define FD_RAW_DISK_CHANGE 4 /* out: disk change flag was set */
|
||||
#define FD_RAW_INTR 8 /* wait for an interrupt */
|
||||
#define FD_RAW_SPIN 0x10 /* spin up the disk for this command */
|
||||
#define FD_RAW_NO_MOTOR_AFTER 0x20 /* switch the motor off after command
|
||||
#define FD_RAW_NO_MOTOR_AFTER 0x20 /* switch the motor off after command
|
||||
* completion */
|
||||
#define FD_RAW_NEED_DISK 0x40 /* this command needs a disk to be present */
|
||||
#define FD_RAW_NEED_SEEK 0x80 /* this command uses an implied seek (soft) */
|
||||
@@ -353,7 +353,7 @@ struct floppy_raw_cmd {
|
||||
|
||||
void __user *data;
|
||||
char *kernel_data; /* location of data buffer in the kernel */
|
||||
struct floppy_raw_cmd *next; /* used for chaining of raw cmd's
|
||||
struct floppy_raw_cmd *next; /* used for chaining of raw cmd's
|
||||
* within the kernel */
|
||||
long length; /* in: length of dma transfer. out: remaining bytes */
|
||||
long phys_length; /* physical length, if different from dma length */
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/const.h>
|
||||
#include <linux/ioctl.h>
|
||||
#else /* __KERNEL__ */
|
||||
#include <stdio.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
Reference in New Issue
Block a user