diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-19 13:11:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-19 13:11:26 -0700 |
commit | d2b1c81f5f6c3427bd900be5fed306ca83d649d4 (patch) | |
tree | b678c7fe0a28c205aca3b5a6fe6f7a9ff0bf7295 /block/partitions | |
parent | 592be758f196ed4610e326fc3f33dadd80aa7c6b (diff) | |
parent | 3373a3461aa15b7f9a871fa4cb2c9ef21ac20b47 (diff) | |
download | linux-stable-d2b1c81f5f6c3427bd900be5fed306ca83d649d4.tar.gz linux-stable-d2b1c81f5f6c3427bd900be5fed306ca83d649d4.tar.bz2 linux-stable-d2b1c81f5f6c3427bd900be5fed306ca83d649d4.zip |
Merge tag 'block-5.8-2020-06-19' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
- Use import_uuid() where appropriate (Andy)
- bcache fixes (Coly, Mauricio, Zhiqiang)
- blktrace sparse warnings fix (Jan)
- blktrace concurrent setup fix (Luis)
- blkdev_get use-after-free fix (Jason)
- Ensure all blk-mq maps are updated (Weiping)
- Loop invalidate bdev fix (Zheng)
* tag 'block-5.8-2020-06-19' of git://git.kernel.dk/linux-block:
block: make function 'kill_bdev' static
loop: replace kill_bdev with invalidate_bdev
partitions/ldm: Replace uuid_copy() with import_uuid() where it makes sense
block: update hctx map when use multiple maps
blktrace: Avoid sparse warnings when assigning q->blk_trace
blktrace: break out of blktrace setup on concurrent calls
block: Fix use-after-free in blkdev_get()
trace/events/block.h: drop kernel-doc for dropped function parameter
blk-mq: Remove redundant 'return' statement
bcache: pr_info() format clean up in bcache_device_init()
bcache: use delayed kworker fo asynchronous devices registration
bcache: check and adjust logical block size for backing devices
bcache: fix potential deadlock problem in btree_gc_coalesce
Diffstat (limited to 'block/partitions')
-rw-r--r-- | block/partitions/ldm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/partitions/ldm.c b/block/partitions/ldm.c index 6fdfcb40c537..d333786b5c7e 100644 --- a/block/partitions/ldm.c +++ b/block/partitions/ldm.c @@ -910,7 +910,7 @@ static bool ldm_parse_dsk4 (const u8 *buffer, int buflen, struct vblk *vb) return false; disk = &vb->vblk.disk; - uuid_copy(&disk->disk_id, (uuid_t *)(buffer + 0x18 + r_name)); + import_uuid(&disk->disk_id, buffer + 0x18 + r_name); return true; } |