OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[uclinux-h8/linux.git]
/
drivers
/
nvme
/
host
/
nvme.h
diff --git
a/drivers/nvme/host/nvme.h
b/drivers/nvme/host/nvme.h
index
ab961bd
..
c4a1bb4
100644
(file)
--- a/
drivers/nvme/host/nvme.h
+++ b/
drivers/nvme/host/nvme.h
@@
-154,6
+154,7
@@
struct nvme_ctrl {
enum nvme_ctrl_state state;
bool identified;
spinlock_t lock;
+ struct mutex scan_lock;
const struct nvme_ctrl_ops *ops;
struct request_queue *admin_q;
struct request_queue *connect_q;