git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
md
/
dm-raid.c
diff --git
a/drivers/md/dm-raid.c
b/drivers/md/dm-raid.c
index
d2a3223
..
86862ea
100644
(file)
--- a/
drivers/md/dm-raid.c
+++ b/
drivers/md/dm-raid.c
@@
-1017,8
+1017,8
@@
static int raid_map(struct dm_target *ti, struct bio *bio, union map_info *map_c
return DM_MAPIO_SUBMITTED;
}
return DM_MAPIO_SUBMITTED;
}
-static
int
raid_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned maxlen)
+static
void
raid_status(struct dm_target *ti, status_type_t type,
+
char *result, unsigned maxlen)
{
struct raid_set *rs = ti->private;
unsigned raid_param_cnt = 1; /* at least 1 for chunksize */
{
struct raid_set *rs = ti->private;
unsigned raid_param_cnt = 1; /* at least 1 for chunksize */
@@
-1153,8
+1153,6
@@
static int raid_status(struct dm_target *ti, status_type_t type,
DMEMIT(" -");
}
}
DMEMIT(" -");
}
}
-
- return 0;
}
static int raid_iterate_devices(struct dm_target *ti, iterate_devices_callout_fn fn, void *data)
}
static int raid_iterate_devices(struct dm_target *ti, iterate_devices_callout_fn fn, void *data)
@@
-1208,7
+1206,7
@@
static void raid_resume(struct dm_target *ti)
static struct target_type raid_target = {
.name = "raid",
static struct target_type raid_target = {
.name = "raid",
- .version = {1, 1,
0
},
+ .version = {1, 1,
1
},
.module = THIS_MODULE,
.ctr = raid_ctr,
.dtr = raid_dtr,
.module = THIS_MODULE,
.ctr = raid_ctr,
.dtr = raid_dtr,