diff options
| -rw-r--r-- | drivers/nvme/host/core.c | 4 | ||||
| -rw-r--r-- | drivers/nvme/host/nvme.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 04a20da76786..e2dcd14012b1 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c | |||
| @@ -3245,7 +3245,7 @@ static void nvme_scan_work(struct work_struct *work) | |||
| 3245 | 3245 | ||
| 3246 | WARN_ON_ONCE(!ctrl->tagset); | 3246 | WARN_ON_ONCE(!ctrl->tagset); |
| 3247 | 3247 | ||
| 3248 | if (test_and_clear_bit(EVENT_NS_CHANGED, &ctrl->events)) { | 3248 | if (test_and_clear_bit(NVME_AER_NOTICE_NS_CHANGED, &ctrl->events)) { |
| 3249 | if (nvme_scan_changed_ns_log(ctrl)) | 3249 | if (nvme_scan_changed_ns_log(ctrl)) |
| 3250 | goto out_sort_namespaces; | 3250 | goto out_sort_namespaces; |
| 3251 | dev_info(ctrl->device, "rescanning namespaces.\n"); | 3251 | dev_info(ctrl->device, "rescanning namespaces.\n"); |
| @@ -3386,7 +3386,7 @@ static void nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result) | |||
| 3386 | { | 3386 | { |
| 3387 | switch ((result & 0xff00) >> 8) { | 3387 | switch ((result & 0xff00) >> 8) { |
| 3388 | case NVME_AER_NOTICE_NS_CHANGED: | 3388 | case NVME_AER_NOTICE_NS_CHANGED: |
| 3389 | set_bit(EVENT_NS_CHANGED, &ctrl->events); | 3389 | set_bit(NVME_AER_NOTICE_NS_CHANGED, &ctrl->events); |
| 3390 | nvme_queue_scan(ctrl); | 3390 | nvme_queue_scan(ctrl); |
| 3391 | break; | 3391 | break; |
| 3392 | case NVME_AER_NOTICE_FW_ACT_STARTING: | 3392 | case NVME_AER_NOTICE_FW_ACT_STARTING: |
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index de24fe77c80b..34df07d44f80 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h | |||
| @@ -194,7 +194,6 @@ struct nvme_ctrl { | |||
| 194 | struct delayed_work ka_work; | 194 | struct delayed_work ka_work; |
| 195 | struct nvme_command ka_cmd; | 195 | struct nvme_command ka_cmd; |
| 196 | struct work_struct fw_act_work; | 196 | struct work_struct fw_act_work; |
| 197 | #define EVENT_NS_CHANGED (1 << 0) | ||
| 198 | unsigned long events; | 197 | unsigned long events; |
| 199 | 198 | ||
| 200 | /* Power saving configuration */ | 199 | /* Power saving configuration */ |
