RE: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
-Original Message- From: gre...@linuxfoundation.org [mailto:gre...@linuxfoundation.org] Sent: Tuesday, August 19, 2014 3:01 PM To: Sharma, Sanjeev Cc: kra...@redhat.com; mdharm-...@one-eyed-alien.net; linux-...@vger.kernel.org; linux-kernel@vger.kernel.org; linux-s...@vger.kernel.org; Hans de Goede Subject: Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held() On Tue, Aug 19, 2014 at 06:33:04AM +, Sharma, Sanjeev wrote: > Hi Greg, > > Any feedback on this patch ? The merge window ended 2 days ago, _and_ I'm at the kernel summit this week, _and_ my queue is currently sitting at: $ mdfrm -c ~/mail/todo/ 1317 messages in /home/gregkh/mail/todo/ So please be patient. I'll get to it in a few weeks. Please let me know when this is going to be merged ? Thanks Sanjeev greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
-Original Message- From: gre...@linuxfoundation.org [mailto:gre...@linuxfoundation.org] Sent: Tuesday, August 19, 2014 3:01 PM To: Sharma, Sanjeev Cc: kra...@redhat.com; mdharm-...@one-eyed-alien.net; linux-...@vger.kernel.org; linux-kernel@vger.kernel.org; linux-s...@vger.kernel.org; Hans de Goede Subject: Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held() On Tue, Aug 19, 2014 at 06:33:04AM +, Sharma, Sanjeev wrote: Hi Greg, Any feedback on this patch ? The merge window ended 2 days ago, _and_ I'm at the kernel summit this week, _and_ my queue is currently sitting at: $ mdfrm -c ~/mail/todo/ 1317 messages in /home/gregkh/mail/todo/ So please be patient. I'll get to it in a few weeks. Please let me know when this is going to be merged ? Thanks Sanjeev greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
Thanks for letting me know. Sanjeev Sharma -Original Message- From: gre...@linuxfoundation.org [mailto:gre...@linuxfoundation.org] Sent: Tuesday, August 19, 2014 3:01 PM To: Sharma, Sanjeev Cc: kra...@redhat.com; mdharm-...@one-eyed-alien.net; linux-...@vger.kernel.org; linux-kernel@vger.kernel.org; linux-s...@vger.kernel.org; Hans de Goede Subject: Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held() On Tue, Aug 19, 2014 at 06:33:04AM +, Sharma, Sanjeev wrote: > Hi Greg, > > Any feedback on this patch ? The merge window ended 2 days ago, _and_ I'm at the kernel summit this week, _and_ my queue is currently sitting at: $ mdfrm -c ~/mail/todo/ 1317 messages in /home/gregkh/mail/todo/ So please be patient. I'll get to it in a few weeks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
On Tue, Aug 19, 2014 at 06:33:04AM +, Sharma, Sanjeev wrote: > Hi Greg, > > Any feedback on this patch ? The merge window ended 2 days ago, _and_ I'm at the kernel summit this week, _and_ my queue is currently sitting at: $ mdfrm -c ~/mail/todo/ 1317 messages in /home/gregkh/mail/todo/ So please be patient. I'll get to it in a few weeks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
Hi Greg, Any feedback on this patch ? Regards Sanjeev Sharma -Original Message- From: Sharma, Sanjeev Sent: Tuesday, August 12, 2014 12:07 PM To: 'Hans de Goede' Cc: gre...@linuxfoundation.org; kra...@redhat.com; mdharm-...@one-eyed-alien.net; linux-...@vger.kernel.org; linux-kernel@vger.kernel.org; linux-s...@vger.kernel.org Subject: RE: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held() Yes I have incorporated review comment from Greg. Regards Sanjeev Sharma -Original Message- From: Hans de Goede [mailto:hdego...@redhat.com] Sent: Tuesday, August 12, 2014 11:59 AM To: Sharma, Sanjeev Cc: gre...@linuxfoundation.org; kra...@redhat.com; mdharm-...@one-eyed-alien.net; linux-...@vger.kernel.org; linux-kernel@vger.kernel.org; linux-s...@vger.kernel.org Subject: Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held() Hi, On 08/12/2014 08:40 AM, Sanjeev Sharma wrote: > on some architecture spin_is_locked() always return false in > uniprocessor configuration and therefore it would be advise to replace > with lockdep_assert_held(). > > Signed-off-by: Sanjeev Sharma > --- > Changes in v3: > incorporated review comment suggested by Greg Thanks, this is still: Acked-by: Hans de Goede Regards, Hans > > drivers/usb/storage/uas.c | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c > index 3f42785..05b2d8e 100644 > --- a/drivers/usb/storage/uas.c > +++ b/drivers/usb/storage/uas.c > @@ -154,7 +154,7 @@ static void uas_mark_cmd_dead(struct uas_dev_info > *devinfo, > struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); > > uas_log_cmd_state(cmnd, caller); > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > WARN_ON_ONCE(cmdinfo->state & COMMAND_ABORTED); > cmdinfo->state |= COMMAND_ABORTED; > cmdinfo->state &= ~IS_IN_WORK_LIST; > @@ -181,7 +181,7 @@ static void uas_add_work(struct uas_cmd_info *cmdinfo) > struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); > struct uas_dev_info *devinfo = cmnd->device->hostdata; > > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > cmdinfo->state |= IS_IN_WORK_LIST; > schedule_work(>work); > } > @@ -283,7 +283,7 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const > char *caller) > struct uas_cmd_info *cmdinfo = (void *)>SCp; > struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata; > > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > if (cmdinfo->state & (COMMAND_INFLIGHT | > DATA_IN_URB_INFLIGHT | > DATA_OUT_URB_INFLIGHT | > @@ -622,7 +622,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd, > struct urb *urb; > int err; > > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > if (cmdinfo->state & SUBMIT_STATUS_URB) { > urb = uas_submit_sense_urb(cmnd, gfp, cmdinfo->stream); > if (!urb) > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
Hi Greg, Any feedback on this patch ? Regards Sanjeev Sharma -Original Message- From: Sharma, Sanjeev Sent: Tuesday, August 12, 2014 12:07 PM To: 'Hans de Goede' Cc: gre...@linuxfoundation.org; kra...@redhat.com; mdharm-...@one-eyed-alien.net; linux-...@vger.kernel.org; linux-kernel@vger.kernel.org; linux-s...@vger.kernel.org Subject: RE: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held() Yes I have incorporated review comment from Greg. Regards Sanjeev Sharma -Original Message- From: Hans de Goede [mailto:hdego...@redhat.com] Sent: Tuesday, August 12, 2014 11:59 AM To: Sharma, Sanjeev Cc: gre...@linuxfoundation.org; kra...@redhat.com; mdharm-...@one-eyed-alien.net; linux-...@vger.kernel.org; linux-kernel@vger.kernel.org; linux-s...@vger.kernel.org Subject: Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held() Hi, On 08/12/2014 08:40 AM, Sanjeev Sharma wrote: on some architecture spin_is_locked() always return false in uniprocessor configuration and therefore it would be advise to replace with lockdep_assert_held(). Signed-off-by: Sanjeev Sharma sanjeev_sha...@mentor.com --- Changes in v3: incorporated review comment suggested by Greg Thanks, this is still: Acked-by: Hans de Goede hdego...@redhat.com Regards, Hans drivers/usb/storage/uas.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index 3f42785..05b2d8e 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -154,7 +154,7 @@ static void uas_mark_cmd_dead(struct uas_dev_info *devinfo, struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); uas_log_cmd_state(cmnd, caller); - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); WARN_ON_ONCE(cmdinfo-state COMMAND_ABORTED); cmdinfo-state |= COMMAND_ABORTED; cmdinfo-state = ~IS_IN_WORK_LIST; @@ -181,7 +181,7 @@ static void uas_add_work(struct uas_cmd_info *cmdinfo) struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); struct uas_dev_info *devinfo = cmnd-device-hostdata; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); cmdinfo-state |= IS_IN_WORK_LIST; schedule_work(devinfo-work); } @@ -283,7 +283,7 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller) struct uas_cmd_info *cmdinfo = (void *)cmnd-SCp; struct uas_dev_info *devinfo = (void *)cmnd-device-hostdata; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); if (cmdinfo-state (COMMAND_INFLIGHT | DATA_IN_URB_INFLIGHT | DATA_OUT_URB_INFLIGHT | @@ -622,7 +622,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd, struct urb *urb; int err; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); if (cmdinfo-state SUBMIT_STATUS_URB) { urb = uas_submit_sense_urb(cmnd, gfp, cmdinfo-stream); if (!urb) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
On Tue, Aug 19, 2014 at 06:33:04AM +, Sharma, Sanjeev wrote: Hi Greg, Any feedback on this patch ? The merge window ended 2 days ago, _and_ I'm at the kernel summit this week, _and_ my queue is currently sitting at: $ mdfrm -c ~/mail/todo/ 1317 messages in /home/gregkh/mail/todo/ So please be patient. I'll get to it in a few weeks. greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
Thanks for letting me know. Sanjeev Sharma -Original Message- From: gre...@linuxfoundation.org [mailto:gre...@linuxfoundation.org] Sent: Tuesday, August 19, 2014 3:01 PM To: Sharma, Sanjeev Cc: kra...@redhat.com; mdharm-...@one-eyed-alien.net; linux-...@vger.kernel.org; linux-kernel@vger.kernel.org; linux-s...@vger.kernel.org; Hans de Goede Subject: Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held() On Tue, Aug 19, 2014 at 06:33:04AM +, Sharma, Sanjeev wrote: Hi Greg, Any feedback on this patch ? The merge window ended 2 days ago, _and_ I'm at the kernel summit this week, _and_ my queue is currently sitting at: $ mdfrm -c ~/mail/todo/ 1317 messages in /home/gregkh/mail/todo/ So please be patient. I'll get to it in a few weeks. greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
Yes I have incorporated review comment from Greg. Regards Sanjeev Sharma -Original Message- From: Hans de Goede [mailto:hdego...@redhat.com] Sent: Tuesday, August 12, 2014 11:59 AM To: Sharma, Sanjeev Cc: gre...@linuxfoundation.org; kra...@redhat.com; mdharm-...@one-eyed-alien.net; linux-...@vger.kernel.org; linux-kernel@vger.kernel.org; linux-s...@vger.kernel.org Subject: Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held() Hi, On 08/12/2014 08:40 AM, Sanjeev Sharma wrote: > on some architecture spin_is_locked() always return false in > uniprocessor configuration and therefore it would be advise to replace > with lockdep_assert_held(). > > Signed-off-by: Sanjeev Sharma > --- > Changes in v3: > incorporated review comment suggested by Greg Thanks, this is still: Acked-by: Hans de Goede Regards, Hans > > drivers/usb/storage/uas.c | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c > index 3f42785..05b2d8e 100644 > --- a/drivers/usb/storage/uas.c > +++ b/drivers/usb/storage/uas.c > @@ -154,7 +154,7 @@ static void uas_mark_cmd_dead(struct uas_dev_info > *devinfo, > struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); > > uas_log_cmd_state(cmnd, caller); > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > WARN_ON_ONCE(cmdinfo->state & COMMAND_ABORTED); > cmdinfo->state |= COMMAND_ABORTED; > cmdinfo->state &= ~IS_IN_WORK_LIST; > @@ -181,7 +181,7 @@ static void uas_add_work(struct uas_cmd_info *cmdinfo) > struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); > struct uas_dev_info *devinfo = cmnd->device->hostdata; > > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > cmdinfo->state |= IS_IN_WORK_LIST; > schedule_work(>work); > } > @@ -283,7 +283,7 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const > char *caller) > struct uas_cmd_info *cmdinfo = (void *)>SCp; > struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata; > > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > if (cmdinfo->state & (COMMAND_INFLIGHT | > DATA_IN_URB_INFLIGHT | > DATA_OUT_URB_INFLIGHT | > @@ -622,7 +622,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd, > struct urb *urb; > int err; > > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > if (cmdinfo->state & SUBMIT_STATUS_URB) { > urb = uas_submit_sense_urb(cmnd, gfp, cmdinfo->stream); > if (!urb) > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
Hi, On 08/12/2014 08:40 AM, Sanjeev Sharma wrote: > on some architecture spin_is_locked() always return false in > uniprocessor configuration and therefore it would be advise > to replace with lockdep_assert_held(). > > Signed-off-by: Sanjeev Sharma > --- > Changes in v3: > incorporated review comment suggested by Greg Thanks, this is still: Acked-by: Hans de Goede Regards, Hans > > drivers/usb/storage/uas.c | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c > index 3f42785..05b2d8e 100644 > --- a/drivers/usb/storage/uas.c > +++ b/drivers/usb/storage/uas.c > @@ -154,7 +154,7 @@ static void uas_mark_cmd_dead(struct uas_dev_info > *devinfo, > struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); > > uas_log_cmd_state(cmnd, caller); > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > WARN_ON_ONCE(cmdinfo->state & COMMAND_ABORTED); > cmdinfo->state |= COMMAND_ABORTED; > cmdinfo->state &= ~IS_IN_WORK_LIST; > @@ -181,7 +181,7 @@ static void uas_add_work(struct uas_cmd_info *cmdinfo) > struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); > struct uas_dev_info *devinfo = cmnd->device->hostdata; > > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > cmdinfo->state |= IS_IN_WORK_LIST; > schedule_work(>work); > } > @@ -283,7 +283,7 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const > char *caller) > struct uas_cmd_info *cmdinfo = (void *)>SCp; > struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata; > > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > if (cmdinfo->state & (COMMAND_INFLIGHT | > DATA_IN_URB_INFLIGHT | > DATA_OUT_URB_INFLIGHT | > @@ -622,7 +622,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd, > struct urb *urb; > int err; > > - WARN_ON_ONCE(!spin_is_locked(>lock)); > + lockdep_assert_held(>lock); > if (cmdinfo->state & SUBMIT_STATUS_URB) { > urb = uas_submit_sense_urb(cmnd, gfp, cmdinfo->stream); > if (!urb) > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
on some architecture spin_is_locked() always return false in uniprocessor configuration and therefore it would be advise to replace with lockdep_assert_held(). Signed-off-by: Sanjeev Sharma --- Changes in v3: incorporated review comment suggested by Greg drivers/usb/storage/uas.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index 3f42785..05b2d8e 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -154,7 +154,7 @@ static void uas_mark_cmd_dead(struct uas_dev_info *devinfo, struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); uas_log_cmd_state(cmnd, caller); - WARN_ON_ONCE(!spin_is_locked(>lock)); + lockdep_assert_held(>lock); WARN_ON_ONCE(cmdinfo->state & COMMAND_ABORTED); cmdinfo->state |= COMMAND_ABORTED; cmdinfo->state &= ~IS_IN_WORK_LIST; @@ -181,7 +181,7 @@ static void uas_add_work(struct uas_cmd_info *cmdinfo) struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); struct uas_dev_info *devinfo = cmnd->device->hostdata; - WARN_ON_ONCE(!spin_is_locked(>lock)); + lockdep_assert_held(>lock); cmdinfo->state |= IS_IN_WORK_LIST; schedule_work(>work); } @@ -283,7 +283,7 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller) struct uas_cmd_info *cmdinfo = (void *)>SCp; struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata; - WARN_ON_ONCE(!spin_is_locked(>lock)); + lockdep_assert_held(>lock); if (cmdinfo->state & (COMMAND_INFLIGHT | DATA_IN_URB_INFLIGHT | DATA_OUT_URB_INFLIGHT | @@ -622,7 +622,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd, struct urb *urb; int err; - WARN_ON_ONCE(!spin_is_locked(>lock)); + lockdep_assert_held(>lock); if (cmdinfo->state & SUBMIT_STATUS_URB) { urb = uas_submit_sense_urb(cmnd, gfp, cmdinfo->stream); if (!urb) -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
on some architecture spin_is_locked() always return false in uniprocessor configuration and therefore it would be advise to replace with lockdep_assert_held(). Signed-off-by: Sanjeev Sharma sanjeev_sha...@mentor.com --- Changes in v3: incorporated review comment suggested by Greg drivers/usb/storage/uas.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index 3f42785..05b2d8e 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -154,7 +154,7 @@ static void uas_mark_cmd_dead(struct uas_dev_info *devinfo, struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); uas_log_cmd_state(cmnd, caller); - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); WARN_ON_ONCE(cmdinfo-state COMMAND_ABORTED); cmdinfo-state |= COMMAND_ABORTED; cmdinfo-state = ~IS_IN_WORK_LIST; @@ -181,7 +181,7 @@ static void uas_add_work(struct uas_cmd_info *cmdinfo) struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); struct uas_dev_info *devinfo = cmnd-device-hostdata; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); cmdinfo-state |= IS_IN_WORK_LIST; schedule_work(devinfo-work); } @@ -283,7 +283,7 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller) struct uas_cmd_info *cmdinfo = (void *)cmnd-SCp; struct uas_dev_info *devinfo = (void *)cmnd-device-hostdata; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); if (cmdinfo-state (COMMAND_INFLIGHT | DATA_IN_URB_INFLIGHT | DATA_OUT_URB_INFLIGHT | @@ -622,7 +622,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd, struct urb *urb; int err; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); if (cmdinfo-state SUBMIT_STATUS_URB) { urb = uas_submit_sense_urb(cmnd, gfp, cmdinfo-stream); if (!urb) -- 1.7.11.7 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
Hi, On 08/12/2014 08:40 AM, Sanjeev Sharma wrote: on some architecture spin_is_locked() always return false in uniprocessor configuration and therefore it would be advise to replace with lockdep_assert_held(). Signed-off-by: Sanjeev Sharma sanjeev_sha...@mentor.com --- Changes in v3: incorporated review comment suggested by Greg Thanks, this is still: Acked-by: Hans de Goede hdego...@redhat.com Regards, Hans drivers/usb/storage/uas.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index 3f42785..05b2d8e 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -154,7 +154,7 @@ static void uas_mark_cmd_dead(struct uas_dev_info *devinfo, struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); uas_log_cmd_state(cmnd, caller); - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); WARN_ON_ONCE(cmdinfo-state COMMAND_ABORTED); cmdinfo-state |= COMMAND_ABORTED; cmdinfo-state = ~IS_IN_WORK_LIST; @@ -181,7 +181,7 @@ static void uas_add_work(struct uas_cmd_info *cmdinfo) struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); struct uas_dev_info *devinfo = cmnd-device-hostdata; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); cmdinfo-state |= IS_IN_WORK_LIST; schedule_work(devinfo-work); } @@ -283,7 +283,7 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller) struct uas_cmd_info *cmdinfo = (void *)cmnd-SCp; struct uas_dev_info *devinfo = (void *)cmnd-device-hostdata; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); if (cmdinfo-state (COMMAND_INFLIGHT | DATA_IN_URB_INFLIGHT | DATA_OUT_URB_INFLIGHT | @@ -622,7 +622,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd, struct urb *urb; int err; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); if (cmdinfo-state SUBMIT_STATUS_URB) { urb = uas_submit_sense_urb(cmnd, gfp, cmdinfo-stream); if (!urb) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held()
Yes I have incorporated review comment from Greg. Regards Sanjeev Sharma -Original Message- From: Hans de Goede [mailto:hdego...@redhat.com] Sent: Tuesday, August 12, 2014 11:59 AM To: Sharma, Sanjeev Cc: gre...@linuxfoundation.org; kra...@redhat.com; mdharm-...@one-eyed-alien.net; linux-...@vger.kernel.org; linux-kernel@vger.kernel.org; linux-s...@vger.kernel.org Subject: Re: [PATCH v3] uas: replace WARN_ON_ONCE() with lockdep_assert_held() Hi, On 08/12/2014 08:40 AM, Sanjeev Sharma wrote: on some architecture spin_is_locked() always return false in uniprocessor configuration and therefore it would be advise to replace with lockdep_assert_held(). Signed-off-by: Sanjeev Sharma sanjeev_sha...@mentor.com --- Changes in v3: incorporated review comment suggested by Greg Thanks, this is still: Acked-by: Hans de Goede hdego...@redhat.com Regards, Hans drivers/usb/storage/uas.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index 3f42785..05b2d8e 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -154,7 +154,7 @@ static void uas_mark_cmd_dead(struct uas_dev_info *devinfo, struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); uas_log_cmd_state(cmnd, caller); - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); WARN_ON_ONCE(cmdinfo-state COMMAND_ABORTED); cmdinfo-state |= COMMAND_ABORTED; cmdinfo-state = ~IS_IN_WORK_LIST; @@ -181,7 +181,7 @@ static void uas_add_work(struct uas_cmd_info *cmdinfo) struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); struct uas_dev_info *devinfo = cmnd-device-hostdata; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); cmdinfo-state |= IS_IN_WORK_LIST; schedule_work(devinfo-work); } @@ -283,7 +283,7 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller) struct uas_cmd_info *cmdinfo = (void *)cmnd-SCp; struct uas_dev_info *devinfo = (void *)cmnd-device-hostdata; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); if (cmdinfo-state (COMMAND_INFLIGHT | DATA_IN_URB_INFLIGHT | DATA_OUT_URB_INFLIGHT | @@ -622,7 +622,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd, struct urb *urb; int err; - WARN_ON_ONCE(!spin_is_locked(devinfo-lock)); + lockdep_assert_held(devinfo-lock); if (cmdinfo-state SUBMIT_STATUS_URB) { urb = uas_submit_sense_urb(cmnd, gfp, cmdinfo-stream); if (!urb) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/