From patchwork Thu Apr 4 16:18:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2393681 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 E16473FD8C for ; Thu, 4 Apr 2013 16:18:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762949Ab3DDQSW (ORCPT ); Thu, 4 Apr 2013 12:18:22 -0400 Received: from mail-ia0-f177.google.com ([209.85.210.177]:43260 "EHLO mail-ia0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762890Ab3DDQSU (ORCPT ); Thu, 4 Apr 2013 12:18:20 -0400 Received: by mail-ia0-f177.google.com with SMTP id w33so2317317iag.8 for ; Thu, 04 Apr 2013 09:18:20 -0700 (PDT) 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=nOHKM+9jkNDGgscz72eAcInO6MOtSbGzRZSQ/LmxOxs=; b=CtflYYdCvKY2k2wbeiKKjQ3F4QHo1Xip7qWbA9PoX6d8qiJABMTRMboQ3zKcIRXjtt y2TpIwPoWbiChK03ySyWa5k7/umnf7Hxyv7QMdyT/lvmywNxhDZiHpMMoOHuWBh0LJXF awtShWj5b7W300TUZ8jZ1tc802qvhuRWEmfS3k9wj7VduI9h6OR9qcAghxEbgNwkNuG4 7LXlKPVWhcpf+Y06VIllpxxS2DWurUNEH2LajCmujKmdQImXG7jMaLcZxX6N3Z42fgzN 9bHZqDVUS0G/5ZKVhY98r/Wc3UcwOOaRUXJpsj2qoSEE6HMk7309hSvXy4AUTR+UvWo4 hWGg== X-Received: by 10.50.100.167 with SMTP id ez7mr10302907igb.3.1365092300289; Thu, 04 Apr 2013 09:18:20 -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 ua6sm13392425igb.0.2013.04.04.09.18.18 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Apr 2013 09:18:19 -0700 (PDT) Message-ID: <515DA7CA.4040808@inktank.com> Date: Thu, 04 Apr 2013 11:18:18 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: [PATCH 1/9] ceph: use page_offset() in ceph_writepages_start() References: <515DA755.2090504@inktank.com> In-Reply-To: <515DA755.2090504@inktank.com> X-Gm-Message-State: ALoCoQkkLsQmr/YBmg7o0CUEQG2J/gImcKeDG+cKgHVb9a/QDjspzApc4xsw5rHNFwnSjufm/Zyh Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org There's one spot in ceph_writepages_start() that open-codes what page_offset() does safely. Use the macro so we don't have to worry about wrapping. This resolves: http://tracker.ceph.com/issues/4648 Signed-off-by: Alex Elder --- fs/ceph/addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 67d4965..6a5a08e 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -900,7 +900,7 @@ get_more_pages: } /* submit the write */ - offset = req->r_data_out.pages[0]->index << PAGE_CACHE_SHIFT; + offset = page_offset(req->r_data_out.pages[0]); len = min((snap_size ? snap_size : i_size_read(inode)) - offset, (u64)locked_pages << PAGE_CACHE_SHIFT); dout("writepages got %d pages at %llu~%llu\n",