From patchwork Tue Jan 28 16:50:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 3547281 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4B72DC02DC for ; Tue, 28 Jan 2014 16:51:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4669A20138 for ; Tue, 28 Jan 2014 16:51:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44B51200ED for ; Tue, 28 Jan 2014 16:51:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754905AbaA1Qvn (ORCPT ); Tue, 28 Jan 2014 11:51:43 -0500 Received: from mail-lb0-f177.google.com ([209.85.217.177]:49037 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754645AbaA1Qvm (ORCPT ); Tue, 28 Jan 2014 11:51:42 -0500 Received: by mail-lb0-f177.google.com with SMTP id z5so560721lbh.8 for ; Tue, 28 Jan 2014 08:51:41 -0800 (PST) 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; bh=A3yifgc78CK54qCuxwJ46Nz0T5XsVf9d4xJGvcE0V3g=; b=YAVUWYQgt//4U/dCxRlheDMKZhNhOz+8jDR8a2kQA0eykDU93MViZQuBGqfGIWIOvL RzVfmIwNXFsd1Lb91FVw9Pppxmco8yHLJ3ZKia4bcQlUlaiMyvL4zjpf8Jtu9L7CHXhD VoRW9ytCwHT0cxwOKPAufLSpj+xNTY8Ib72j00JuzXSKEyDkrUK/9CzLUZjTIvpiptvB wtS9Ojz9PMOH4TNyQ37OWjUOAz90H7GteVILnlT/P31hC/JnX7RoiFlODUaWi+tce/0G s4vE8YWIZvhvI13yDBy1sl3nLwyzwle8DrS/V0hn8JbxhCzafMjsLDV5LKwAMFgFMOdw BqFA== X-Gm-Message-State: ALoCoQljwdHLABxrSVPnJ+0mUym8TGuwU6N2nwCN+pFS74UvF4RQCYEMVxpc6PraFi3UcRhSgqXY X-Received: by 10.112.136.36 with SMTP id px4mr1233009lbb.46.1390927900874; Tue, 28 Jan 2014 08:51:40 -0800 (PST) Received: from localhost ([109.110.66.110]) by mx.google.com with ESMTPSA id ri4sm17609558lbb.6.2014.01.28.08.51.39 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 28 Jan 2014 08:51:39 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: ilya.dryomov@inktank.com, "Yan, Zheng" Subject: [PATCH] ceph: fix dout() compile warnings in ceph_filemap_fault() Date: Tue, 28 Jan 2014 18:50:41 +0200 Message-Id: <1390927841-9515-1-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP PAGE_CACHE_SIZE is unsigned long on all architectures, however size_t is either unsigned int or unsigned long. Rather than change format strings, cast PAGE_CACHE_SIZE to size_t to be in line with dout()s in ceph_page_mkwrite(). Cc: Yan, Zheng Signed-off-by: Ilya Dryomov --- fs/ceph/addr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 791a9a23fc60..b53278c9fd97 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -1220,7 +1220,7 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) int want, got, ret; dout("filemap_fault %p %llx.%llx %llu~%zd trying to get caps\n", - inode, ceph_vinop(inode), off, PAGE_CACHE_SIZE); + inode, ceph_vinop(inode), off, (size_t)PAGE_CACHE_SIZE); if (fi->fmode & CEPH_FILE_MODE_LAZY) want = CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO; else @@ -1236,12 +1236,12 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) } } dout("filemap_fault %p %llu~%zd got cap refs on %s\n", - inode, off, PAGE_CACHE_SIZE, ceph_cap_string(got)); + inode, off, (size_t)PAGE_CACHE_SIZE, ceph_cap_string(got)); ret = filemap_fault(vma, vmf); dout("filemap_fault %p %llu~%zd dropping cap refs on %s ret %d\n", - inode, off, PAGE_CACHE_SIZE, ceph_cap_string(got), ret); + inode, off, (size_t)PAGE_CACHE_SIZE, ceph_cap_string(got), ret); ceph_put_cap_refs(ci, got); return ret;