Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
md
/
dm-exception-store.c
diff --git
a/kernel/drivers/md/dm-exception-store.c
b/kernel/drivers/md/dm-exception-store.c
index
ebaa4f8
..
3997f34
100644
(file)
--- a/
kernel/drivers/md/dm-exception-store.c
+++ b/
kernel/drivers/md/dm-exception-store.c
@@
-183,7
+183,7
@@
int dm_exception_store_set_chunk_size(struct dm_exception_store *store,
store->chunk_size = chunk_size;
store->chunk_mask = chunk_size - 1;
store->chunk_size = chunk_size;
store->chunk_mask = chunk_size - 1;
- store->chunk_shift =
ffs(chunk_size) - 1
;
+ store->chunk_shift =
__ffs(chunk_size)
;
return 0;
}
return 0;
}
@@
-203,7
+203,7
@@
int dm_exception_store_create(struct dm_target *ti, int argc, char **argv,
return -EINVAL;
}
return -EINVAL;
}
- tmp_store = k
m
alloc(sizeof(*tmp_store), GFP_KERNEL);
+ tmp_store = k
z
alloc(sizeof(*tmp_store), GFP_KERNEL);
if (!tmp_store) {
ti->error = "Exception store allocation failed";
return -ENOMEM;
if (!tmp_store) {
ti->error = "Exception store allocation failed";
return -ENOMEM;
@@
-215,7
+215,7
@@
int dm_exception_store_create(struct dm_target *ti, int argc, char **argv,
else if (persistent == 'N')
type = get_type("N");
else {
else if (persistent == 'N')
type = get_type("N");
else {
- ti->error = "
Persistent flag
is not P or N";
+ ti->error = "
Exception store type
is not P or N";
r = -EINVAL;
goto bad_type;
}
r = -EINVAL;
goto bad_type;
}
@@
-233,7
+233,7
@@
int dm_exception_store_create(struct dm_target *ti, int argc, char **argv,
if (r)
goto bad;
if (r)
goto bad;
- r = type->ctr(tmp_store,
0, NULL
);
+ r = type->ctr(tmp_store,
(strlen(argv[0]) > 1 ? &argv[0][1] : NULL)
);
if (r) {
ti->error = "Exception store type constructor failed";
goto bad;
if (r) {
ti->error = "Exception store type constructor failed";
goto bad;