From patchwork Thu Jul 26 18:57:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1244191 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id BB01F3FC5A for ; Thu, 26 Jul 2012 18:57:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752440Ab2GZS5u (ORCPT ); Thu, 26 Jul 2012 14:57:50 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:34518 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752426Ab2GZS5u (ORCPT ); Thu, 26 Jul 2012 14:57:50 -0400 Received: by mail-yx0-f174.google.com with SMTP id l2so2332418yen.19 for ; Thu, 26 Jul 2012 11:57:50 -0700 (PDT) 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:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=nUXRgxGxy/LllGtPaltbEAk44ZgI9COJb0YAXUMCa6M=; b=XKv+Y1jTMLQqoE0+K8MgJVWBacwcGKl8V8++CGzRgWIqisz0jGtsHa64pK0WH8NxdF q53Pld3vlo63KqYZdvtVJClIepo4tNrGhStIPCzQTPIuPCcMfcs+35TOzqosSwhUXdi1 CGhDjELOEvfcotaj2KM3kNMcIvgrz6zDt7+4GUOGM+VYKlyesazUnK0V1D8nl31lcALF W/3rasuSypirnnFnRQCrYC/b1pxNxl3rbXuuJJpCc62v04HUk7KTrO5istmmSqNaLXmQ 6gTwZUaq5WaLDBoMnR/ZG7ASn0r5tUuVTJsBgdXhMAmCJLCuHuM94LIlJzuJ8nC6z1QX By4Q== Received: by 10.236.200.167 with SMTP id z27mr28909987yhn.131.1343329070137; Thu, 26 Jul 2012 11:57:50 -0700 (PDT) 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 f68sm43486938yhh.22.2012.07.26.11.57.49 (version=SSLv3 cipher=OTHER); Thu, 26 Jul 2012 11:57:49 -0700 (PDT) Message-ID: <5011932D.1060005@inktank.com> Date: Thu, 26 Jul 2012 13:57:49 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 6/7] rbd: drop "object_name" from rbd_req_sync_notify_ack() References: <50119076.1030307@inktank.com> In-Reply-To: <50119076.1030307@inktank.com> X-Gm-Message-State: ALoCoQmAb4egX+aS1LsTZR9SEDmJhRwrg98u+8AOxf10rqpHvHiCuryd5u3JJfYABEBBT3l3lOac Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org rbd_req_sync_notify_ack() only ever uses rbd_dev->header_name as the value of its "object_name" parameter, and that value is available within the function already. So get rid of the parameter. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) int ret; @@ -1200,7 +1199,7 @@ static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev, ops[0].watch.flag = 0; ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP, - object_name, 0, 0, NULL, + rbd_dev->header_name, 0, 0, NULL, NULL, 0, CEPH_OSD_FLAG_READ, ops, @@ -1230,7 +1229,7 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data) pr_warning(RBD_DRV_NAME "%d got notification but failed to " " update snaps: %d\n", rbd_dev->major, rc); - rbd_req_sync_notify_ack(rbd_dev, hver, notify_id, rbd_dev->header_name); + rbd_req_sync_notify_ack(rbd_dev, hver, notify_id); } /* diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index b9aa377..48a7927 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1185,8 +1185,7 @@ static int rbd_req_sync_read(struct rbd_device *rbd_dev, */ static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev, u64 ver, - u64 notify_id, - const char *object_name) + u64 notify_id) { struct ceph_osd_req_op *ops;