Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mdadm: do not display bitmap info if it is cleared 

"mdadm -X DISK" is used to report information about a bitmap
file, it is better to not display all the related infos if
bitmap is cleared with "--bitmap=none" under grow mode.

To do that, the locate_bitmap is changed a little to have a
return value based on MD_FEATURE_BITMAP_OFFSET.

Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: NeilBrown <neilb@suse.com>
This commit is contained in:
Guoqing Jiang 2015-12-02 00:30:12 +08:00 committed by NeilBrown
parent 8b2202ded1
commit 53e76b1def
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bitmap.c
View File

@ -221,8 +221,12 @@ int bitmap_file_open(char *filename, struct supertype **stp)
pr_err("No bitmap possible with %s metadata\n",
st->ss->name);
return -1;
} else
st->ss->locate_bitmap(st, fd);
} else {
if (st->ss->locate_bitmap(st, fd)) {
pr_err("%s doesn't have bitmap\n", filename);
fd = -1;
}
}
*stp = st;
} else {

2
mdadm.h
View File

@ -903,7 +903,7 @@ extern struct superswitch {
/* Seek 'fd' to start of write-intent-bitmap. Must be an
* md-native format bitmap
*/
void (*locate_bitmap)(struct supertype *st, int fd);
int (*locate_bitmap)(struct supertype *st, int fd);
/* if add_internal_bitmap succeeded for existing array, this
* writes it out.
*/

7
super0.c
View File

@ -1155,16 +1155,16 @@ static int add_internal_bitmap0(struct supertype *st, int *chunkp,
return 1;
}
static void locate_bitmap0(struct supertype *st, int fd)
static int locate_bitmap0(struct supertype *st, int fd)
{
unsigned long long dsize;
unsigned long long offset;
if (!get_dev_size(fd, NULL, &dsize))
return;
return -1;
if (dsize < MD_RESERVED_SECTORS*512)
return;
return -1;
offset = MD_NEW_SIZE_SECTORS(dsize>>9);
@ -1173,6 +1173,7 @@ static void locate_bitmap0(struct supertype *st, int fd)
offset += MD_SB_BYTES;
lseek64(fd, offset, 0);
return 0;
}
static int write_bitmap0(struct supertype *st, int fd, enum bitmap_update update)

12
super1.c
View File

@ -1520,7 +1520,7 @@ static int add_to_super1(struct supertype *st, mdu_disk_info_t *dk,
}
#endif
static void locate_bitmap1(struct supertype *st, int fd);
static int locate_bitmap1(struct supertype *st, int fd);
static int store_super1(struct supertype *st, int fd)
{
@ -2305,24 +2305,30 @@ add_internal_bitmap1(struct supertype *st,
return 1;
}
static void locate_bitmap1(struct supertype *st, int fd)
static int locate_bitmap1(struct supertype *st, int fd)
{
unsigned long long offset;
struct mdp_superblock_1 *sb;
int mustfree = 0;
int ret;
if (!st->sb) {
if (st->ss->load_super(st, fd, NULL))
return; /* no error I hope... */
return -1; /* no error I hope... */
mustfree = 1;
}
sb = st->sb;
if ((__le32_to_cpu(sb->feature_map) & MD_FEATURE_BITMAP_OFFSET))
ret = 0;
else
ret = -1;
offset = __le64_to_cpu(sb->super_offset);
offset += (int32_t) __le32_to_cpu(sb->bitmap_offset);
if (mustfree)
free(sb);
lseek64(fd, offset<<9, 0);
return ret;
}
static int write_bitmap1(struct supertype *st, int fd, enum bitmap_update update)