Skip to content

Commit ee16c40

Browse files
committed
Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-6.2
Pull MD fix from Song: "It fixes an issue introduced by recent code refactor." * 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md: md: fix incorrect declaration about claim_rdev in md_import_device
2 parents 3d25b1e + b0907ca commit ee16c40

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/md/md.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3644,7 +3644,7 @@ EXPORT_SYMBOL_GPL(md_rdev_init);
36443644
*/
36453645
static struct md_rdev *md_import_device(dev_t newdev, int super_format, int super_minor)
36463646
{
3647-
static struct md_rdev *claim_rdev; /* just for claiming the bdev */
3647+
static struct md_rdev claim_rdev; /* just for claiming the bdev */
36483648
struct md_rdev *rdev;
36493649
sector_t size;
36503650
int err;
@@ -3662,7 +3662,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supe
36623662

36633663
rdev->bdev = blkdev_get_by_dev(newdev,
36643664
FMODE_READ | FMODE_WRITE | FMODE_EXCL,
3665-
super_format == -2 ? claim_rdev : rdev);
3665+
super_format == -2 ? &claim_rdev : rdev);
36663666
if (IS_ERR(rdev->bdev)) {
36673667
pr_warn("md: could not open device unknown-block(%u,%u).\n",
36683668
MAJOR(newdev), MINOR(newdev));

0 commit comments

Comments
 (0)