From patchwork Wed Oct 26 08:01:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 79352 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp280290qge; Wed, 26 Oct 2016 01:05:21 -0700 (PDT) X-Received: by 10.98.153.204 with SMTP id t73mr1848570pfk.144.1477469121463; Wed, 26 Oct 2016 01:05:21 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fe1si1025841pab.327.2016.10.26.01.05.20; Wed, 26 Oct 2016 01:05:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760064AbcJZIFQ (ORCPT + 27 others); Wed, 26 Oct 2016 04:05:16 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:33187 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759949AbcJZIBi (ORCPT ); Wed, 26 Oct 2016 04:01:38 -0400 Received: by mail-pf0-f169.google.com with SMTP id 197so11524741pfu.0 for ; Wed, 26 Oct 2016 01:01:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kX9fy6nztZSkwUDm3NFMtb7nSI5ui5OmCHQyRHXaKuk=; b=FsdZFip7Z3i5zbTTZjfUTUOWjed+4/W/iYOitH9Nrasv/+Lakq8+BiykfiNO1wc9h1 D5L9AtYqxNfOX8nfRrtBccQg+avX4Fk2WHD3vL1D/tGCBop6mvi/zRaS8qEsym0bbBNI +W1HVrW/KSHHEMReFkOLNw8d4C/md8RqeXy5I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kX9fy6nztZSkwUDm3NFMtb7nSI5ui5OmCHQyRHXaKuk=; b=AMekxdyaae7ByCspRT94HI/b9USbB+Q6H4ss8whOLHBbIb/7Aif//dQ+Zv0Y5cvlDb cxGPH1GPYM17ovLotFUqRoUt1XgttlV45YPlf6EUrWapK/PvLb8Q9VQvn5PF8X8veA/6 QGuUT9JFBQ+EiDsFSgEKpz4IjkKQY+yj2v2tjg28U7Mt8vvA909WiE08wNydOC+vr8xh FsaaoszhMgPr2NrYlv/Q0FBJmIZ3aWXDDy4dvKhXTKbMEN4xmDMTmFErqjb1EQut9t7V NIIlnulZJnN6N49e0OMMmNyUB5ModQl50RRZdAECTvVkR3kR7hbtFg9tFcM+G1G8Zw3M 7Ecg== X-Gm-Message-State: ABUngvf1YzwEHPg03tWNknrD/zayxovAZDc/HQdyiyfKvLH/Ny86D3+WqnI2GgBhqM/WunGO X-Received: by 10.98.80.130 with SMTP id g2mr1719549pfj.179.1477468897711; Wed, 26 Oct 2016 01:01:37 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id 74sm2011923pfp.77.2016.10.26.01.01.34 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Oct 2016 01:01:37 -0700 (PDT) From: Binoy Jayan To: Doug Ledford , Sean Hefty , Hal Rosenstock Cc: Arnd Bergmann , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Binoy Jayan Subject: [PATCH v3 5/9] IB/isert: Replace semaphore sem with completion Date: Wed, 26 Oct 2016 13:31:10 +0530 Message-Id: <1477468874-16328-6-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1477468874-16328-1-git-send-email-binoy.jayan@linaro.org> References: <1477468874-16328-1-git-send-email-binoy.jayan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The semaphore 'sem' in isert_device is used as completion, so convert it to struct completion. Semaphores are going away in the future. Signed-off-by: Binoy Jayan --- drivers/infiniband/ulp/isert/ib_isert.c | 6 +++--- drivers/infiniband/ulp/isert/ib_isert.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c index 6dd43f6..de80f56 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.c +++ b/drivers/infiniband/ulp/isert/ib_isert.c @@ -619,7 +619,7 @@ mutex_unlock(&isert_np->mutex); isert_info("np %p: Allow accept_np to continue\n", isert_np); - up(&isert_np->sem); + complete(&isert_np->comp); } static void @@ -2311,7 +2311,7 @@ struct rdma_cm_id * isert_err("Unable to allocate struct isert_np\n"); return -ENOMEM; } - sema_init(&isert_np->sem, 0); + init_completion(&isert_np->comp); mutex_init(&isert_np->mutex); INIT_LIST_HEAD(&isert_np->accepted); INIT_LIST_HEAD(&isert_np->pending); @@ -2427,7 +2427,7 @@ struct rdma_cm_id * int ret; accept_wait: - ret = down_interruptible(&isert_np->sem); + ret = wait_for_completion_interruptible(&isert_np->comp); if (ret) return -ENODEV; diff --git a/drivers/infiniband/ulp/isert/ib_isert.h b/drivers/infiniband/ulp/isert/ib_isert.h index c02ada5..a1277c0 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.h +++ b/drivers/infiniband/ulp/isert/ib_isert.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -190,7 +191,7 @@ struct isert_device { struct isert_np { struct iscsi_np *np; - struct semaphore sem; + struct completion comp; struct rdma_cm_id *cm_id; struct mutex mutex; struct list_head accepted;