xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md: override md superblock recovery_offset for journal device

Browse Source 
Journal device stores data in a log structure. We need record the log
start. Here we override md superblock recovery_offset for this purpose.
This field of a journal device is meaningless otherwise.

Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: NeilBrown <neilb@suse.com>
This commit is contained in:
Shaohua Li
2015-08-13 14:31:56 -07:00
committed by NeilBrown
parent bac624f3f8
commit 3069aa8def
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/md/md.c
View File

@@ -1646,6 +1646,7 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev)
return -EINVAL; return -EINVAL;
} }
set_bit(Journal, &rdev->flags); set_bit(Journal, &rdev->flags);
rdev->journal_tail = le64_to_cpu(sb->journal_tail);
break; break;
default: default:
rdev->saved_raid_disk = role; rdev->saved_raid_disk = role;
@@ -1721,6 +1722,9 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
sb->feature_map |= sb->feature_map |=
cpu_to_le32(MD_FEATURE_RECOVERY_BITMAP); cpu_to_le32(MD_FEATURE_RECOVERY_BITMAP);
} }
/* Note: recovery_offset and journal_tail share space */
if (test_bit(Journal, &rdev->flags))
sb->journal_tail = cpu_to_le64(rdev->journal_tail);
if (test_bit(Replacement, &rdev->flags)) if (test_bit(Replacement, &rdev->flags))
sb->feature_map |= sb->feature_map |=
cpu_to_le32(MD_FEATURE_REPLACEMENT); cpu_to_le32(MD_FEATURE_REPLACEMENT);
@@ -8097,6 +8101,8 @@ static int remove_and_add_spares(struct mddev *mddev,
continue; continue;
if (test_bit(Faulty, &rdev->flags)) if (test_bit(Faulty, &rdev->flags))
continue; continue;
if (test_bit(Journal, &rdev->flags))
continue;
if (mddev->ro && if (mddev->ro &&
! (rdev->saved_raid_disk >= 0 && ! (rdev->saved_raid_disk >= 0 &&
!test_bit(Bitmap_sync, &rdev->flags))) !test_bit(Bitmap_sync, &rdev->flags)))

8
drivers/md/md.h
View File

@@ -87,10 +87,16 @@ struct md_rdev {
* array and could again if we did a partial * array and could again if we did a partial
* resync from the bitmap * resync from the bitmap
*/ */
sector_t recovery_offset;/* If this device has been partially union {
sector_t recovery_offset;/* If this device has been partially
* recovered, this is where we were * recovered, this is where we were
* up to. * up to.
*/ */
sector_t journal_tail; /* If this device is a journal device,
* this is the journal tail (journal
* recovery start point)
*/
};
atomic_t nr_pending; /* number of pending requests. atomic_t nr_pending; /* number of pending requests.
* only maintained for arrays that * only maintained for arrays that

5
include/uapi/linux/raid/md_p.h
View File

@@ -258,7 +258,10 @@ struct mdp_superblock_1 {
__le64 data_offset; /* sector start of data, often 0 */ __le64 data_offset; /* sector start of data, often 0 */
__le64 data_size; /* sectors in this device that can be used for data */ __le64 data_size; /* sectors in this device that can be used for data */
__le64 super_offset; /* sector start of this superblock */ __le64 super_offset; /* sector start of this superblock */
__le64 recovery_offset;/* sectors before this offset (from data_offset) have been recovered */ union {
__le64 recovery_offset;/* sectors before this offset (from data_offset) have been recovered */
__le64 journal_tail;/* journal tail of journal device (from data_offset) */
};
__le32 dev_number; /* permanent identifier of this device - not role in raid */ __le32 dev_number; /* permanent identifier of this device - not role in raid */
__le32 cnt_corrected_read; /* number of read errors that were corrected by re-writing */ __le32 cnt_corrected_read; /* number of read errors that were corrected by re-writing */
__u8 device_uuid[16]; /* user-space setable, ignored by kernel */ __u8 device_uuid[16]; /* user-space setable, ignored by kernel */