diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-05-08 17:29:19 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-05-08 17:29:19 -0400 |
| commit | b9dc00596b94d50a272d32a62c9d069f0e74109c (patch) | |
| tree | 429000b8bfeb61e9d4fad4a37c3b1dffb8fe2830 /block | |
| parent | 26cdaf0cbb2d15abc8b551c1f26c860dc9cd656c (diff) | |
| parent | 630b59cde7be8248b425cbe27c970c2ba8db36f2 (diff) | |
| download | linux-rt-b9dc00596b94d50a272d32a62c9d069f0e74109c.tar.gz | |
Merge tag 'v3.18.50' into v3.18-rt
This is the 3.18.50 stable release
Conflicts:
drivers/block/zram/zram_drv.c
Diffstat (limited to 'block')
| -rw-r--r-- | block/scsi_ioctl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index b0c2a616c8f9..4a2735dce513 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -182,6 +182,9 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter) __set_bit(WRITE_16, filter->write_ok); __set_bit(WRITE_LONG, filter->write_ok); __set_bit(WRITE_LONG_2, filter->write_ok); + __set_bit(WRITE_SAME, filter->write_ok); + __set_bit(WRITE_SAME_16, filter->write_ok); + __set_bit(WRITE_SAME_32, filter->write_ok); __set_bit(ERASE, filter->write_ok); __set_bit(GPCMD_MODE_SELECT_10, filter->write_ok); __set_bit(MODE_SELECT, filter->write_ok); |