diff --git a/[refs] b/[refs] index ad00ee41fafd..d78a3bfa6e19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0ca340cd20b350eab8288974e9a6077900846e8 +refs/heads/master: 978f946bb628ef228e13aadf4d4255b8727c4fc3 diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 06dee51456e8..653d4dcbee23 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -2689,14 +2689,6 @@ static int do_md_stop(mddev_t * mddev, int ro) set_disk_ro(disk, 1); } - bitmap_destroy(mddev); - if (mddev->bitmap_file) { - atomic_set(&mddev->bitmap_file->f_dentry->d_inode->i_writecount, 1); - fput(mddev->bitmap_file); - mddev->bitmap_file = NULL; - } - mddev->bitmap_offset = 0; - /* * Free resources if final stop */ @@ -2706,6 +2698,14 @@ static int do_md_stop(mddev_t * mddev, int ro) struct gendisk *disk; printk(KERN_INFO "md: %s stopped.\n", mdname(mddev)); + bitmap_destroy(mddev); + if (mddev->bitmap_file) { + atomic_set(&mddev->bitmap_file->f_dentry->d_inode->i_writecount, 1); + fput(mddev->bitmap_file); + mddev->bitmap_file = NULL; + } + mddev->bitmap_offset = 0; + ITERATE_RDEV(mddev,rdev,tmp) if (rdev->raid_disk >= 0) { char nm[20];