Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
3572324a
Commit
3572324a
authored
Jan 10, 2014
by
Kent Overstreet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bcache: Minor fixes from kbuild robot
Signed-off-by:
Kent Overstreet
<
kmo@daterainc.com
>
parent
94717447
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
5 deletions
+8
-5
drivers/md/bcache/bset.c
drivers/md/bcache/bset.c
+5
-2
drivers/md/bcache/btree.c
drivers/md/bcache/btree.c
+1
-1
drivers/md/bcache/extents.c
drivers/md/bcache/extents.c
+1
-1
drivers/md/bcache/sysfs.c
drivers/md/bcache/sysfs.c
+1
-1
No files found.
drivers/md/bcache/bset.c
View file @
3572324a
...
...
@@ -23,7 +23,7 @@ void bch_dump_bset(struct btree_keys *b, struct bset *i, unsigned set)
for
(
k
=
i
->
start
;
k
<
bset_bkey_last
(
i
);
k
=
next
)
{
next
=
bkey_next
(
k
);
printk
(
KERN_ERR
"block %u key %
z
i/%u: "
,
set
,
printk
(
KERN_ERR
"block %u key %
l
i/%u: "
,
set
,
(
uint64_t
*
)
k
-
i
->
d
,
i
->
keys
);
if
(
b
->
ops
->
key_dump
)
...
...
@@ -1185,9 +1185,12 @@ static void __btree_sort(struct btree_keys *b, struct btree_iter *iter,
struct
bset
*
out
=
(
void
*
)
__get_free_pages
(
__GFP_NOWARN
|
GFP_NOIO
,
order
);
if
(
!
out
)
{
struct
page
*
outp
;
BUG_ON
(
order
>
state
->
page_order
);
out
=
page_address
(
mempool_alloc
(
state
->
pool
,
GFP_NOIO
));
outp
=
mempool_alloc
(
state
->
pool
,
GFP_NOIO
);
out
=
page_address
(
outp
);
used_mempool
=
true
;
order
=
state
->
page_order
;
}
...
...
drivers/md/bcache/btree.c
View file @
3572324a
...
...
@@ -1805,7 +1805,7 @@ static bool btree_insert_key(struct btree *b, struct bkey *k,
static
size_t
insert_u64s_remaining
(
struct
btree
*
b
)
{
ssize_t
ret
=
bch_btree_keys_u64s_remaining
(
&
b
->
keys
);
long
ret
=
bch_btree_keys_u64s_remaining
(
&
b
->
keys
);
/*
* Might land in the middle of an existing extent and have to split it
...
...
drivers/md/bcache/extents.c
View file @
3572324a
...
...
@@ -194,7 +194,7 @@ static bool btree_ptr_bad_expensive(struct btree *b, const struct bkey *k)
mutex_unlock
(
&
b
->
c
->
bucket_lock
);
bch_extent_to_text
(
buf
,
sizeof
(
buf
),
k
);
btree_bug
(
b
,
"inconsistent btree pointer %s: bucket %
l
i pin %i prio %i gen %i last_gc %i mark %llu gc_gen %i"
,
"inconsistent btree pointer %s: bucket %
z
i pin %i prio %i gen %i last_gc %i mark %llu gc_gen %i"
,
buf
,
PTR_BUCKET_NR
(
b
->
c
,
k
,
i
),
atomic_read
(
&
g
->
pin
),
g
->
prio
,
g
->
gen
,
g
->
last_gc
,
GC_MARK
(
g
),
g
->
gc_gen
);
return
true
;
...
...
drivers/md/bcache/sysfs.c
View file @
3572324a
...
...
@@ -416,7 +416,7 @@ static int btree_bset_stats(struct btree_op *b_op, struct btree *b)
return
MAP_CONTINUE
;
}
int
bch_bset_print_stats
(
struct
cache_set
*
c
,
char
*
buf
)
static
int
bch_bset_print_stats
(
struct
cache_set
*
c
,
char
*
buf
)
{
struct
bset_stats_op
op
;
int
ret
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment