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
nexedi
linux
Commits
c4d951dd
Commit
c4d951dd
authored
Aug 21, 2013
by
Kent Overstreet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bcache: Fix sysfs splat on shutdown with flash only devs
Whoops. Signed-off-by:
Kent Overstreet
<
kmo@daterainc.com
>
parent
48a915a8
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
33 deletions
+30
-33
drivers/md/bcache/bcache.h
drivers/md/bcache/bcache.h
+4
-6
drivers/md/bcache/request.c
drivers/md/bcache/request.c
+1
-1
drivers/md/bcache/super.c
drivers/md/bcache/super.c
+20
-21
drivers/md/bcache/sysfs.c
drivers/md/bcache/sysfs.c
+1
-1
drivers/md/bcache/writeback.c
drivers/md/bcache/writeback.c
+3
-3
drivers/md/bcache/writeback.h
drivers/md/bcache/writeback.h
+1
-1
No files found.
drivers/md/bcache/bcache.h
View file @
c4d951dd
...
@@ -266,12 +266,10 @@ struct bcache_device {
...
@@ -266,12 +266,10 @@ struct bcache_device {
struct
gendisk
*
disk
;
struct
gendisk
*
disk
;
/* If nonzero, we're closing */
unsigned
long
flags
;
atomic_t
closing
;
#define BCACHE_DEV_CLOSING 0
#define BCACHE_DEV_DETACHING 1
/* If nonzero, we're detaching/unregistering from cache set */
#define BCACHE_DEV_UNLINK_DONE 2
atomic_t
detaching
;
int
flush_done
;
unsigned
nr_stripes
;
unsigned
nr_stripes
;
unsigned
stripe_size
;
unsigned
stripe_size
;
...
...
drivers/md/bcache/request.c
View file @
c4d951dd
...
@@ -512,7 +512,7 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio)
...
@@ -512,7 +512,7 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio)
struct
task_struct
*
task
=
current
;
struct
task_struct
*
task
=
current
;
struct
io
*
i
;
struct
io
*
i
;
if
(
atomic_read
(
&
dc
->
disk
.
detaching
)
||
if
(
test_bit
(
BCACHE_DEV_DETACHING
,
&
dc
->
disk
.
flags
)
||
c
->
gc_stats
.
in_use
>
CUTOFF_CACHE_ADD
||
c
->
gc_stats
.
in_use
>
CUTOFF_CACHE_ADD
||
(
bio
->
bi_rw
&
REQ_DISCARD
))
(
bio
->
bi_rw
&
REQ_DISCARD
))
goto
skip
;
goto
skip
;
...
...
drivers/md/bcache/super.c
View file @
c4d951dd
...
@@ -621,7 +621,7 @@ static void prio_read(struct cache *ca, uint64_t bucket)
...
@@ -621,7 +621,7 @@ static void prio_read(struct cache *ca, uint64_t bucket)
static
int
open_dev
(
struct
block_device
*
b
,
fmode_t
mode
)
static
int
open_dev
(
struct
block_device
*
b
,
fmode_t
mode
)
{
{
struct
bcache_device
*
d
=
b
->
bd_disk
->
private_data
;
struct
bcache_device
*
d
=
b
->
bd_disk
->
private_data
;
if
(
atomic_read
(
&
d
->
closing
))
if
(
test_bit
(
BCACHE_DEV_CLOSING
,
&
d
->
flags
))
return
-
ENXIO
;
return
-
ENXIO
;
closure_get
(
&
d
->
cl
);
closure_get
(
&
d
->
cl
);
...
@@ -650,12 +650,15 @@ static const struct block_device_operations bcache_ops = {
...
@@ -650,12 +650,15 @@ static const struct block_device_operations bcache_ops = {
void
bcache_device_stop
(
struct
bcache_device
*
d
)
void
bcache_device_stop
(
struct
bcache_device
*
d
)
{
{
if
(
!
atomic_xchg
(
&
d
->
closing
,
1
))
if
(
!
test_and_set_bit
(
BCACHE_DEV_CLOSING
,
&
d
->
flags
))
closure_queue
(
&
d
->
cl
);
closure_queue
(
&
d
->
cl
);
}
}
static
void
bcache_device_unlink
(
struct
bcache_device
*
d
)
static
void
bcache_device_unlink
(
struct
bcache_device
*
d
)
{
{
lockdep_assert_held
(
&
bch_register_lock
);
if
(
d
->
c
&&
!
test_and_set_bit
(
BCACHE_DEV_UNLINK_DONE
,
&
d
->
flags
))
{
unsigned
i
;
unsigned
i
;
struct
cache
*
ca
;
struct
cache
*
ca
;
...
@@ -664,6 +667,7 @@ static void bcache_device_unlink(struct bcache_device *d)
...
@@ -664,6 +667,7 @@ static void bcache_device_unlink(struct bcache_device *d)
for_each_cache
(
ca
,
d
->
c
,
i
)
for_each_cache
(
ca
,
d
->
c
,
i
)
bd_unlink_disk_holder
(
ca
->
bdev
,
d
->
disk
);
bd_unlink_disk_holder
(
ca
->
bdev
,
d
->
disk
);
}
}
}
static
void
bcache_device_link
(
struct
bcache_device
*
d
,
struct
cache_set
*
c
,
static
void
bcache_device_link
(
struct
bcache_device
*
d
,
struct
cache_set
*
c
,
...
@@ -687,18 +691,15 @@ static void bcache_device_detach(struct bcache_device *d)
...
@@ -687,18 +691,15 @@ static void bcache_device_detach(struct bcache_device *d)
{
{
lockdep_assert_held
(
&
bch_register_lock
);
lockdep_assert_held
(
&
bch_register_lock
);
if
(
atomic_read
(
&
d
->
detaching
))
{
if
(
test_bit
(
BCACHE_DEV_DETACHING
,
&
d
->
flags
))
{
struct
uuid_entry
*
u
=
d
->
c
->
uuids
+
d
->
id
;
struct
uuid_entry
*
u
=
d
->
c
->
uuids
+
d
->
id
;
SET_UUID_FLASH_ONLY
(
u
,
0
);
SET_UUID_FLASH_ONLY
(
u
,
0
);
memcpy
(
u
->
uuid
,
invalid_uuid
,
16
);
memcpy
(
u
->
uuid
,
invalid_uuid
,
16
);
u
->
invalidated
=
cpu_to_le32
(
get_seconds
());
u
->
invalidated
=
cpu_to_le32
(
get_seconds
());
bch_uuid_write
(
d
->
c
);
bch_uuid_write
(
d
->
c
);
atomic_set
(
&
d
->
detaching
,
0
);
}
}
if
(
!
d
->
flush_done
)
bcache_device_unlink
(
d
);
bcache_device_unlink
(
d
);
d
->
c
->
devices
[
d
->
id
]
=
NULL
;
d
->
c
->
devices
[
d
->
id
]
=
NULL
;
...
@@ -879,7 +880,7 @@ static void cached_dev_detach_finish(struct work_struct *w)
...
@@ -879,7 +880,7 @@ static void cached_dev_detach_finish(struct work_struct *w)
struct
closure
cl
;
struct
closure
cl
;
closure_init_stack
(
&
cl
);
closure_init_stack
(
&
cl
);
BUG_ON
(
!
atomic_read
(
&
dc
->
disk
.
detaching
));
BUG_ON
(
!
test_bit
(
BCACHE_DEV_DETACHING
,
&
dc
->
disk
.
flags
));
BUG_ON
(
atomic_read
(
&
dc
->
count
));
BUG_ON
(
atomic_read
(
&
dc
->
count
));
mutex_lock
(
&
bch_register_lock
);
mutex_lock
(
&
bch_register_lock
);
...
@@ -893,6 +894,8 @@ static void cached_dev_detach_finish(struct work_struct *w)
...
@@ -893,6 +894,8 @@ static void cached_dev_detach_finish(struct work_struct *w)
bcache_device_detach
(
&
dc
->
disk
);
bcache_device_detach
(
&
dc
->
disk
);
list_move
(
&
dc
->
list
,
&
uncached_devices
);
list_move
(
&
dc
->
list
,
&
uncached_devices
);
clear_bit
(
BCACHE_DEV_DETACHING
,
&
dc
->
disk
.
flags
);
mutex_unlock
(
&
bch_register_lock
);
mutex_unlock
(
&
bch_register_lock
);
pr_info
(
"Caching disabled for %s"
,
bdevname
(
dc
->
bdev
,
buf
));
pr_info
(
"Caching disabled for %s"
,
bdevname
(
dc
->
bdev
,
buf
));
...
@@ -905,10 +908,10 @@ void bch_cached_dev_detach(struct cached_dev *dc)
...
@@ -905,10 +908,10 @@ void bch_cached_dev_detach(struct cached_dev *dc)
{
{
lockdep_assert_held
(
&
bch_register_lock
);
lockdep_assert_held
(
&
bch_register_lock
);
if
(
atomic_read
(
&
dc
->
disk
.
closing
))
if
(
test_bit
(
BCACHE_DEV_CLOSING
,
&
dc
->
disk
.
flags
))
return
;
return
;
if
(
atomic_xchg
(
&
dc
->
disk
.
detaching
,
1
))
if
(
test_and_set_bit
(
BCACHE_DEV_DETACHING
,
&
dc
->
disk
.
flags
))
return
;
return
;
/*
/*
...
@@ -1064,11 +1067,7 @@ static void cached_dev_flush(struct closure *cl)
...
@@ -1064,11 +1067,7 @@ static void cached_dev_flush(struct closure *cl)
struct
bcache_device
*
d
=
&
dc
->
disk
;
struct
bcache_device
*
d
=
&
dc
->
disk
;
mutex_lock
(
&
bch_register_lock
);
mutex_lock
(
&
bch_register_lock
);
d
->
flush_done
=
1
;
if
(
d
->
c
)
bcache_device_unlink
(
d
);
bcache_device_unlink
(
d
);
mutex_unlock
(
&
bch_register_lock
);
mutex_unlock
(
&
bch_register_lock
);
bch_cache_accounting_destroy
(
&
dc
->
accounting
);
bch_cache_accounting_destroy
(
&
dc
->
accounting
);
...
...
drivers/md/bcache/sysfs.c
View file @
c4d951dd
...
@@ -370,7 +370,7 @@ STORE(__bch_flash_dev)
...
@@ -370,7 +370,7 @@ STORE(__bch_flash_dev)
}
}
if
(
attr
==
&
sysfs_unregister
)
{
if
(
attr
==
&
sysfs_unregister
)
{
atomic_set
(
&
d
->
detaching
,
1
);
set_bit
(
BCACHE_DEV_DETACHING
,
&
d
->
flags
);
bcache_device_stop
(
d
);
bcache_device_stop
(
d
);
}
}
...
...
drivers/md/bcache/writeback.c
View file @
c4d951dd
...
@@ -89,7 +89,7 @@ static unsigned writeback_delay(struct cached_dev *dc, unsigned sectors)
...
@@ -89,7 +89,7 @@ static unsigned writeback_delay(struct cached_dev *dc, unsigned sectors)
{
{
uint64_t
ret
;
uint64_t
ret
;
if
(
atomic_read
(
&
dc
->
disk
.
detaching
)
||
if
(
test_bit
(
BCACHE_DEV_DETACHING
,
&
dc
->
disk
.
flags
)
||
!
dc
->
writeback_percent
)
!
dc
->
writeback_percent
)
return
0
;
return
0
;
...
@@ -404,7 +404,7 @@ static int bch_writeback_thread(void *arg)
...
@@ -404,7 +404,7 @@ static int bch_writeback_thread(void *arg)
while
(
!
kthread_should_stop
())
{
while
(
!
kthread_should_stop
())
{
down_write
(
&
dc
->
writeback_lock
);
down_write
(
&
dc
->
writeback_lock
);
if
(
!
atomic_read
(
&
dc
->
has_dirty
)
||
if
(
!
atomic_read
(
&
dc
->
has_dirty
)
||
(
!
atomic_read
(
&
dc
->
disk
.
detaching
)
&&
(
!
test_bit
(
BCACHE_DEV_DETACHING
,
&
dc
->
disk
.
flags
)
&&
!
dc
->
writeback_running
))
{
!
dc
->
writeback_running
))
{
up_write
(
&
dc
->
writeback_lock
);
up_write
(
&
dc
->
writeback_lock
);
set_current_state
(
TASK_INTERRUPTIBLE
);
set_current_state
(
TASK_INTERRUPTIBLE
);
...
@@ -437,7 +437,7 @@ static int bch_writeback_thread(void *arg)
...
@@ -437,7 +437,7 @@ static int bch_writeback_thread(void *arg)
while
(
delay
&&
while
(
delay
&&
!
kthread_should_stop
()
&&
!
kthread_should_stop
()
&&
!
atomic_read
(
&
dc
->
disk
.
detaching
))
!
test_bit
(
BCACHE_DEV_DETACHING
,
&
dc
->
disk
.
flags
))
delay
=
schedule_timeout_interruptible
(
delay
);
delay
=
schedule_timeout_interruptible
(
delay
);
}
}
}
}
...
...
drivers/md/bcache/writeback.h
View file @
c4d951dd
...
@@ -45,7 +45,7 @@ static inline bool should_writeback(struct cached_dev *dc, struct bio *bio,
...
@@ -45,7 +45,7 @@ static inline bool should_writeback(struct cached_dev *dc, struct bio *bio,
unsigned
in_use
=
dc
->
disk
.
c
->
gc_stats
.
in_use
;
unsigned
in_use
=
dc
->
disk
.
c
->
gc_stats
.
in_use
;
if
(
cache_mode
!=
CACHE_MODE_WRITEBACK
||
if
(
cache_mode
!=
CACHE_MODE_WRITEBACK
||
atomic_read
(
&
dc
->
disk
.
detaching
)
||
test_bit
(
BCACHE_DEV_DETACHING
,
&
dc
->
disk
.
flags
)
||
in_use
>
CUTOFF_WRITEBACK_SYNC
)
in_use
>
CUTOFF_WRITEBACK_SYNC
)
return
false
;
return
false
;
...
...
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