Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Simple cases of overlapping changes in the packet scheduler.

Must easier to resolve this time.

Which probably means that I screwed it up somehow.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 1 insertions, 7 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ad3ea24f0885..bcc1694cebcd 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2685,7 +2685,6 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
 
         }
         sdev->sdev_state = state;
-        sysfs_notify(&sdev->sdev_gendev.kobj, NULL, "state");
         return 0;
 
  illegal:
@@ -3109,7 +3108,6 @@ int scsi_internal_device_unblock_nowait(struct scsi_device *sdev,
         case SDEV_BLOCK:
         case SDEV_TRANSPORT_OFFLINE:
                 sdev->sdev_state = new_state;
-                sysfs_notify(&sdev->sdev_gendev.kobj, NULL, "state");
                 break;
         case SDEV_CREATED_BLOCK:
                 if (new_state == SDEV_TRANSPORT_OFFLINE ||
@@ -3117,7 +3115,6 @@ int scsi_internal_device_unblock_nowait(struct scsi_device *sdev,
                         sdev->sdev_state = new_state;
                 else
                         sdev->sdev_state = SDEV_CREATED;
-                sysfs_notify(&sdev->sdev_gendev.kobj, NULL, "state");
                 break;
         case SDEV_CANCEL:
         case SDEV_OFFLINE:
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
index 4f6f01cf9968..36f6190931bc 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -556,11 +556,8 @@ int srp_reconnect_rport(struct srp_rport *rport)
                  */
                 shost_for_each_device(sdev, shost) {
                         mutex_lock(&sdev->state_mutex);
-                        if (sdev->sdev_state == SDEV_OFFLINE) {
+                        if (sdev->sdev_state == SDEV_OFFLINE)
                                 sdev->sdev_state = SDEV_RUNNING;
-                                sysfs_notify(&sdev->sdev_gendev.kobj,
-                                             NULL, "state");
-                        }
                         mutex_unlock(&sdev->state_mutex);
                 }
         } else if (rport->state == SRP_RPORT_RUNNING) {