git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-4.19/post-20180822' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
drivers
/
md
/
bcache
/
request.h
diff --git
a/drivers/md/bcache/request.h
b/drivers/md/bcache/request.h
index dea0886b81c1740de564a64581eb9b3deff46dd3..aa055cfeb0998cbc0b1c65203376bd5b9d4bbfc3 100644
(file)
--- a/
drivers/md/bcache/request.h
+++ b/
drivers/md/bcache/request.h
@@
-8,7
+8,7
@@
struct data_insert_op {
struct bio *bio;
struct workqueue_struct *wq;
struct bio *bio;
struct workqueue_struct *wq;
- unsigned
inode;
+ unsigned
int
inode;
uint16_t write_point;
uint16_t write_prio;
blk_status_t status;
uint16_t write_point;
uint16_t write_prio;
blk_status_t status;
@@
-17,15
+17,15
@@
struct data_insert_op {
uint16_t flags;
struct {
uint16_t flags;
struct {
- unsigned
bypass:1;
- unsigned
writeback:1;
- unsigned
flush_journal:1;
- unsigned
csum:1;
+ unsigned
int
bypass:1;
+ unsigned
int
writeback:1;
+ unsigned
int
flush_journal:1;
+ unsigned
int
csum:1;
- unsigned
replace:1;
- unsigned
replace_collision:1;
+ unsigned
int
replace:1;
+ unsigned
int
replace_collision:1;
- unsigned
insert_data_done:1;
+ unsigned
int
insert_data_done:1;
};
};
};
};
@@
-33,7
+33,7
@@
struct data_insert_op {
BKEY_PADDED(replace_key);
};
BKEY_PADDED(replace_key);
};
-unsigned
bch_get_congested(struct cache_set *
);
+unsigned
int bch_get_congested(struct cache_set *c
);
void bch_data_insert(struct closure *cl);
void bch_cached_dev_request_init(struct cached_dev *dc);
void bch_data_insert(struct closure *cl);
void bch_cached_dev_request_init(struct cached_dev *dc);