Staging: hv: move ASSERT(scmnd) to a more useful location
authorBill Pemberton <wfp5p@virginia.edu>
Mon, 3 May 2010 21:50:45 +0000 (17:50 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 May 2010 18:36:04 +0000 (11:36 -0700)
There's not much point to make sure scmnd is not NULL after an assert
that would dereference scmnd.  The ASSERT()'s should be removed, but
until they are at least they at least can be in the right order.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/storvsc_drv.c

index 5e28e4c36434810f5a879d753aa970180382cf50..26b35a6c679a151e48816dad7ab3c0283498a72d 100644 (file)
@@ -386,9 +386,9 @@ static void storvsc_commmand_completion(struct hv_storvsc_request *request)
        struct scsi_sense_hdr sense_hdr;
 
        ASSERT(request == &cmd_request->request);
+       ASSERT(scmnd);
        ASSERT((unsigned long)scmnd->host_scribble ==
                (unsigned long)cmd_request);
-       ASSERT(scmnd);
        ASSERT(scmnd->scsi_done);
 
        DPRINT_ENTER(STORVSC_DRV);