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
/
persistent-data
/
dm-block-manager.c
diff --git
a/kernel/drivers/md/persistent-data/dm-block-manager.c
b/kernel/drivers/md/persistent-data/dm-block-manager.c
index
087411c
..
f2393ba
100644
(file)
--- a/
kernel/drivers/md/persistent-data/dm-block-manager.c
+++ b/
kernel/drivers/md/persistent-data/dm-block-manager.c
@@
-454,7
+454,7
@@
int dm_bm_read_lock(struct dm_block_manager *bm, dm_block_t b,
int r;
p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
int r;
p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
- if (
unlikely(IS_ERR(p)
))
+ if (
IS_ERR(p
))
return PTR_ERR(p);
aux = dm_bufio_get_aux_data(to_buffer(*result));
return PTR_ERR(p);
aux = dm_bufio_get_aux_data(to_buffer(*result));
@@
-490,7
+490,7
@@
int dm_bm_write_lock(struct dm_block_manager *bm,
return -EPERM;
p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
return -EPERM;
p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
- if (
unlikely(IS_ERR(p)
))
+ if (
IS_ERR(p
))
return PTR_ERR(p);
aux = dm_bufio_get_aux_data(to_buffer(*result));
return PTR_ERR(p);
aux = dm_bufio_get_aux_data(to_buffer(*result));
@@
-523,7
+523,7
@@
int dm_bm_read_try_lock(struct dm_block_manager *bm,
int r;
p = dm_bufio_get(bm->bufio, b, (struct dm_buffer **) result);
int r;
p = dm_bufio_get(bm->bufio, b, (struct dm_buffer **) result);
- if (
unlikely(IS_ERR(p)
))
+ if (
IS_ERR(p
))
return PTR_ERR(p);
if (unlikely(!p))
return -EWOULDBLOCK;
return PTR_ERR(p);
if (unlikely(!p))
return -EWOULDBLOCK;
@@
-559,7
+559,7
@@
int dm_bm_write_lock_zero(struct dm_block_manager *bm,
return -EPERM;
p = dm_bufio_new(bm->bufio, b, (struct dm_buffer **) result);
return -EPERM;
p = dm_bufio_new(bm->bufio, b, (struct dm_buffer **) result);
- if (
unlikely(IS_ERR(p)
))
+ if (
IS_ERR(p
))
return PTR_ERR(p);
memset(p, 0, dm_bm_block_size(bm));
return PTR_ERR(p);
memset(p, 0, dm_bm_block_size(bm));
@@
-578,7
+578,7
@@
int dm_bm_write_lock_zero(struct dm_block_manager *bm,
}
EXPORT_SYMBOL_GPL(dm_bm_write_lock_zero);
}
EXPORT_SYMBOL_GPL(dm_bm_write_lock_zero);
-
int
dm_bm_unlock(struct dm_block *b)
+
void
dm_bm_unlock(struct dm_block *b)
{
struct buffer_aux *aux;
aux = dm_bufio_get_aux_data(to_buffer(b));
{
struct buffer_aux *aux;
aux = dm_bufio_get_aux_data(to_buffer(b));
@@
-590,8
+590,6
@@
int dm_bm_unlock(struct dm_block *b)
bl_up_read(&aux->lock);
dm_bufio_release(to_buffer(b));
bl_up_read(&aux->lock);
dm_bufio_release(to_buffer(b));
-
- return 0;
}
EXPORT_SYMBOL_GPL(dm_bm_unlock);
}
EXPORT_SYMBOL_GPL(dm_bm_unlock);
@@
-609,6
+607,12
@@
void dm_bm_prefetch(struct dm_block_manager *bm, dm_block_t b)
dm_bufio_prefetch(bm->bufio, b, 1);
}
dm_bufio_prefetch(bm->bufio, b, 1);
}
+bool dm_bm_is_read_only(struct dm_block_manager *bm)
+{
+ return bm->read_only;
+}
+EXPORT_SYMBOL_GPL(dm_bm_is_read_only);
+
void dm_bm_set_read_only(struct dm_block_manager *bm)
{
bm->read_only = true;
void dm_bm_set_read_only(struct dm_block_manager *bm)
{
bm->read_only = true;