From patchwork Sat Feb 16 16:31:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2151811 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 B32AEDF2A1 for ; Sat, 16 Feb 2013 16:31:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753617Ab3BPQbX (ORCPT ); Sat, 16 Feb 2013 11:31:23 -0500 Received: from mail-qe0-f43.google.com ([209.85.128.43]:64911 "EHLO mail-qe0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753600Ab3BPQbW (ORCPT ); Sat, 16 Feb 2013 11:31:22 -0500 Received: by mail-qe0-f43.google.com with SMTP id 3so1858870qeb.2 for ; Sat, 16 Feb 2013 08:31:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=xsJdv3g4aPE9dJcw/skLE+j0yirm2N7q3xRayNUkawk=; b=gUio0QgfnPSLLCu0fw2emJeq11e7MgSTbwyRlNR9tBb5laJX2iYDAfhyQZLpxWtZLy WBaY+M7op2x8kZKs29XFC0Zrn7MOIJxJI6QPD6nhTiEVbZe3LXR1TEuLlJIUAgnino8y QdpwE92PzvMwiJ/eS3UiDOLq/GzHvJ91/THMXYGdzRLVyuf02UgJnj38hFISygvvJ0tP VlhyLEfL0uv6gg5uaUbYS7GcfnN2VtxynPkPie4rwB4dghl5ahsigV8P9R6oNjbKE6xj RFLZSXjyh4FBkwzpmfGih1jcWVF5fjPi40IDyfJ/JTHnG7C1UgYgT5rWlaE3i/vOW+6Q 2K3w== X-Received: by 10.49.37.226 with SMTP id b2mr2606444qek.31.1361032282015; Sat, 16 Feb 2013 08:31:22 -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 dg4sm21210935qab.7.2013.02.16.08.31.20 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 16 Feb 2013 08:31:21 -0800 (PST) Message-ID: <511FB458.2050303@inktank.com> Date: Sat, 16 Feb 2013 10:31:20 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 2/4] ceph: kill ceph_osdc_writepages() "dosync" parameter References: <511FB409.8080007@inktank.com> In-Reply-To: <511FB409.8080007@inktank.com> X-Gm-Message-State: ALoCoQmojntYAYDSdr2C0dypOQfpSEQwjm6Zl3pbXxtnlxQvqLEy+lydmMBKVIIPUX15jPny/a4l Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org There is only one caller of ceph_osdc_writepages(), and it always passes 0 as its "dosync" argument. Get rid of that argument and replace its use in ceph_osdc_writepages() with 0. Signed-off-by: Alex Elder --- fs/ceph/addr.c | 2 +- include/linux/ceph/osd_client.h | 2 +- net/ceph/osd_client.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) int rc = 0; @@ -1878,7 +1878,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, CEPH_OSD_OP_WRITE, flags | CEPH_OSD_FLAG_ONDISK | CEPH_OSD_FLAG_WRITE, - snapc, do_sync, + snapc, 0, truncate_seq, truncate_size, mtime, true, 1, page_align); if (IS_ERR(req)) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index c7e401c..bef5528 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -493,7 +493,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) page_off, len, ci->i_truncate_seq, ci->i_truncate_size, &inode->i_mtime, - &page, 1, 0, 0); + &page, 1, 0); if (err < 0) { dout("writepage setting page/mapping error %d %p\n", err, page); SetPageError(page); diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index afcb255..7a63100 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -275,7 +275,7 @@ extern int ceph_osdc_writepages(struct ceph_osd_client *osdc, u32 truncate_seq, u64 truncate_size, struct timespec *mtime, struct page **pages, int nr_pages, - int flags, int do_sync); + int flags); /* watch/notify events */ extern int ceph_osdc_create_event(struct ceph_osd_client *osdc, diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index dd01b13..ac186b7 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1867,7 +1867,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, u32 truncate_seq, u64 truncate_size, struct timespec *mtime, struct page **pages, int num_pages, - int flags, int do_sync) + int flags) { struct ceph_osd_request *req;