diff options
| author | Steve French <smfrench@gmail.com> | 2018-02-03 19:45:07 -0600 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2018-02-07 09:36:43 -0600 |
| commit | f9de151bf2b8055563b85ff6896fd86891bbe6c5 (patch) | |
| tree | 283d4d14dc93b7327714d7d753a219f9a308df35 | |
| parent | ade7db991b47ab3016a414468164f4966bd08202 (diff) | |
| download | linux-f9de151bf2b8055563b85ff6896fd86891bbe6c5.tar.gz | |
address lock imbalance warnings in smbdirect.c
Although at least one of these was an overly strict sparse warning in the new smbdirect code, it is cleaner to fix - so no warnings. Signed-off-by: Steve French <smfrench@gmail.com> Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
| -rw-r--r-- | fs/cifs/smbdirect.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c index 5130492847eb..91710eb571fb 100644 --- a/fs/cifs/smbdirect.c +++ b/fs/cifs/smbdirect.c @@ -217,9 +217,10 @@ static void smbd_destroy_rdma_work(struct work_struct *work) spin_unlock_irqrestore( &info->reassembly_queue_lock, flags); put_receive_buffer(info, response); - } + } else + spin_unlock_irqrestore(&info->reassembly_queue_lock, flags); } while (response); - spin_unlock_irqrestore(&info->reassembly_queue_lock, flags); + info->reassembly_data_length = 0; log_rdma_event(INFO, "free receive buffers\n"); @@ -1934,15 +1935,16 @@ again: * No need to lock if we are not at the * end of the queue */ - if (!queue_length) + if (queue_length) + list_del(&response->list); + else { spin_lock_irq( &info->reassembly_queue_lock); - list_del(&response->list); - queue_removed++; - if (!queue_length) + list_del(&response->list); spin_unlock_irq( &info->reassembly_queue_lock); - + } + queue_removed++; info->count_reassembly_queue--; info->count_dequeue_reassembly_queue++; put_receive_buffer(info, response); |