Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63832aab authored by Shivaram Upadhyayula's avatar Shivaram Upadhyayula Committed by Nicholas Bellinger
Browse files

qla2xxx: Fix schedule_delayed_work() for target timeout calculations 



This patch fixes two cases in qla_target.c code where the
schedule_delayed_work() value was being incorrectly calculated
from sess->expires - jiffies.

Signed-off-by: default avatarShivaram U <shivaram.u@quadstor.com>
Cc: <stable@vger.kernel.org> #3.6+
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 94a71110

drivers/scsi/qla2xxx/qla_target.c

+5 −4
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static void qlt_schedule_sess_for_deletion(struct qla_tgt_sess *sess, 
		schedule_delayed_work(&tgt->sess_del_work, 0);

	else

		schedule_delayed_work(&tgt->sess_del_work,

		    jiffies - sess->expires);

		    sess->expires - jiffies);

}



/* ha->hardware_lock supposed to be held on entry */
@@ -550,13 +550,14 @@ static void qlt_del_sess_work_fn(struct delayed_work *work) 
	struct scsi_qla_host *vha = tgt->vha;

	struct qla_hw_data *ha = vha->hw;

	struct qla_tgt_sess *sess;

	unsigned long flags;

	unsigned long flags, elapsed;



	spin_lock_irqsave(&ha->hardware_lock, flags);

	while (!list_empty(&tgt->del_sess_list)) {

		sess = list_entry(tgt->del_sess_list.next, typeof(*sess),

		    del_list_entry);

		if (time_after_eq(jiffies, sess->expires)) {

		elapsed = jiffies;

		if (time_after_eq(elapsed, sess->expires)) {

			qlt_undelete_sess(sess);



			ql_dbg(ql_dbg_tgt_mgt, vha, 0xf004,
@@ -566,7 +567,7 @@ static void qlt_del_sess_work_fn(struct delayed_work *work) 
			ha->tgt.tgt_ops->put_sess(sess);

		} else {

			schedule_delayed_work(&tgt->sess_del_work,

			    jiffies - sess->expires);

			    sess->expires - elapsed);

			break;

		}

	}