From patchwork Wed Nov 14 16:36:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1742751 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E84F9DF264 for ; Wed, 14 Nov 2012 16:36:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964835Ab2KNQgU (ORCPT ); Wed, 14 Nov 2012 11:36:20 -0500 Received: from mail-ie0-f174.google.com ([209.85.223.174]:33470 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964820Ab2KNQgU (ORCPT ); Wed, 14 Nov 2012 11:36:20 -0500 Received: by mail-ie0-f174.google.com with SMTP id k13so886465iea.19 for ; Wed, 14 Nov 2012 08:36:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=bCtM7Q7Auv8XRP4olhiTZ62/9rJaRYVR2ih+2STnR1M=; b=R7uyQLhsZd6bv9EhcxBe4yRyGb0GXv/q2RnU0e7YzyuJWkHItX1HZJ3iQmHDo2AO4y DP2zkayE0obuud8MSV+zV+MwCfGrwh+5d2/CJAkvVNew3BzsNX8Kd5E1VoF1UgTMM6nR mpCYjIi1KBdOj3aaeEz6QCpaDeXyfnLbHq2YwDB5DHdTJh6o5nUWcAr499+1iritTBit 1bXoiHBm49nyDv9Jh3fdD+YGsx8nJUyMpd3ueV8PpA4j3spNOHSxPPRDq2fnOTDab/Pe cP8JMJU89uIDc42m+d+uGgNHYg7w5+gAKRZA1h7rXY0FcMMiMbe/Q0JkUW/6fHF3/7Up KD/g== Received: by 10.50.33.194 with SMTP id t2mr2390977igi.69.1352910979666; Wed, 14 Nov 2012 08:36:19 -0800 (PST) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id yf6sm1644428igb.0.2012.11.14.08.36.17 (version=SSLv3 cipher=OTHER); Wed, 14 Nov 2012 08:36:18 -0800 (PST) Message-ID: <50A3C881.50006@inktank.com> Date: Wed, 14 Nov 2012 10:36:17 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: [PATCH] rbd: combine rbd sync watch/unwatch functions X-Gm-Message-State: ALoCoQmakvhaSPhQY0BWoSSalx5xAQ3AyXTLY0PyRjH1pDuLTl+n7gEOe/5v9M3xQcpT9H4L0I1x Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org The rbd_req_sync_watch() and rbd_req_sync_unwatch() functions are nearly identical. Combine them into a single function with a flag indicating whether a watch is to be initiated or torn down. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 81 +++++++++++++++++---------------------------------- 1 file changed, 27 insertions(+), 54 deletions(-) @@ -3018,7 +2992,7 @@ static int rbd_init_watch_dev(struct rbd_device *rbd_dev) int ret, rc; do { - ret = rbd_req_sync_watch(rbd_dev); + ret = rbd_req_sync_watch(rbd_dev, true); if (ret == -ERANGE) { rc = rbd_dev_refresh(rbd_dev, NULL); if (rc < 0) @@ -3729,8 +3703,7 @@ static void rbd_dev_release(struct device *dev) rbd_dev->watch_request); } if (rbd_dev->watch_event) - rbd_req_sync_unwatch(rbd_dev); - + rbd_req_sync_watch(rbd_dev, false); /* clean up and free blkdev */ rbd_free_disk(rbd_dev); diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index a2f9df7..e1094ff 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1434,74 +1434,48 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data) } /* - * Request sync osd watch + * Request sync osd watch/unwatch. The value of "start" determines + * whether a watch request is being initiated or torn down. */ -static int rbd_req_sync_watch(struct rbd_device *rbd_dev) +static int rbd_req_sync_watch(struct rbd_device *rbd_dev, bool start) { struct ceph_osd_req_op *op; - struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc; + struct ceph_osd_request **linger_req = NULL; + __le64 version = 0; int ret; op = rbd_create_rw_op(CEPH_OSD_OP_WATCH, 0); if (!op) return -ENOMEM; - ret = ceph_osdc_create_event(osdc, rbd_watch_cb, 0, - (void *)rbd_dev, &rbd_dev->watch_event); - if (ret < 0) - goto fail; - - op->watch.ver = cpu_to_le64(rbd_dev->header.obj_version); - op->watch.cookie = cpu_to_le64(rbd_dev->watch_event->cookie); - op->watch.flag = 1; - - ret = rbd_req_sync_op(rbd_dev, - CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, - op, - rbd_dev->header_name, - 0, 0, NULL, - &rbd_dev->watch_request, NULL); - - if (ret < 0) - goto fail_event; - - rbd_destroy_op(op); - return 0; - -fail_event: - ceph_osdc_cancel_event(rbd_dev->watch_event); - rbd_dev->watch_event = NULL; -fail: - rbd_destroy_op(op); - return ret; -} - -/* - * Request sync osd unwatch - */ -static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev) -{ - struct ceph_osd_req_op *op; - int ret; + if (start) { + struct ceph_osd_client *osdc; - op = rbd_create_rw_op(CEPH_OSD_OP_WATCH, 0); - if (!op) - return -ENOMEM; + osdc = &rbd_dev->rbd_client->client->osdc; + ret = ceph_osdc_create_event(osdc, rbd_watch_cb, 0, rbd_dev, + &rbd_dev->watch_event); + if (ret < 0) + goto done; + version = cpu_to_le64(rbd_dev->header.obj_version); + linger_req = &rbd_dev->watch_request; + } - op->watch.ver = 0; + op->watch.ver = version; op->watch.cookie = cpu_to_le64(rbd_dev->watch_event->cookie); - op->watch.flag = 0; + op->watch.flag = (u8) start; ret = rbd_req_sync_op(rbd_dev, CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, - op, - rbd_dev->header_name, - 0, 0, NULL, NULL, NULL); - + op, rbd_dev->header_name, + 0, 0, NULL, linger_req, NULL); + if (!start || ret < 0) { + ceph_osdc_cancel_event(rbd_dev->watch_event); + rbd_dev->watch_event = NULL; + } +done: rbd_destroy_op(op); - ceph_osdc_cancel_event(rbd_dev->watch_event); - rbd_dev->watch_event = NULL; + return ret; }