tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'block-5.9-2020-08-28' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:

- nbd timeout fix (Hou)

- device size fix for loop LOOP_CONFIGURE (Martijn)

- MD pull from Song with raid5 stripe size fix (Yufen)

* tag 'block-5.9-2020-08-28' of git://git.kernel.dk/linux-block:
md/raid5: make sure stripe_size as power of two
loop: Set correct device size when using LOOP_CONFIGURE
nbd: restore default timeout when setting it to zero

Linus Torvalds 4d41ead6 24148d86

+9 -4
+2 -2
drivers/block/loop.c
··· 1114 1114 mapping = file->f_mapping; 1115 1115 inode = mapping->host; 1116 1116 1117 - size = get_loop_size(lo, file); 1118 - 1119 1117 if ((config->info.lo_flags & ~LOOP_CONFIGURE_SETTABLE_FLAGS) != 0) { 1120 1118 error = -EINVAL; 1121 1119 goto out_unlock; ··· 1163 1165 loop_update_rotational(lo); 1164 1166 loop_update_dio(lo); 1165 1167 loop_sysfs_init(lo); 1168 + 1169 + size = get_loop_size(lo, file); 1166 1170 loop_set_size(lo, size); 1167 1171 1168 1172 set_blocksize(bdev, S_ISBLK(inode->i_mode) ?
+2
drivers/block/nbd.c
··· 1363 1363 nbd->tag_set.timeout = timeout * HZ; 1364 1364 if (timeout) 1365 1365 blk_queue_rq_timeout(nbd->disk->queue, timeout * HZ); 1366 + else 1367 + blk_queue_rq_timeout(nbd->disk->queue, 30 * HZ); 1366 1368 } 1367 1369 1368 1370 /* Must be called with config_lock held */
+5 -2
drivers/md/raid5.c
··· 6514 6514 6515 6515 /* 6516 6516 * The value should not be bigger than PAGE_SIZE. It requires to 6517 - * be multiple of DEFAULT_STRIPE_SIZE. 6517 + * be multiple of DEFAULT_STRIPE_SIZE and the value should be power 6518 + * of two. 6518 6519 */ 6519 - if (new % DEFAULT_STRIPE_SIZE != 0 || new > PAGE_SIZE || new == 0) 6520 + if (new % DEFAULT_STRIPE_SIZE != 0 || 6521 + new > PAGE_SIZE || new == 0 || 6522 + new != roundup_pow_of_two(new)) 6520 6523 return -EINVAL; 6521 6524 6522 6525 err = mddev_lock(mddev);