From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24198C352A3 for ; Fri, 14 Feb 2020 00:00:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE65D218AC for ; Fri, 14 Feb 2020 00:00:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581638403; bh=UrQXyz0IZ/cGcPKAlIBURYOtW8z0qfZYmQlNNIYIwpc=; h=Subject:From:To:Cc:Date:In-Reply-To:References:List-ID:From; b=J1XSKblhLF/GfxYI+NGwoJGR4DrtnTJ7AaHIEA7rTUSyI4HHWyy5gbUlWtTJmrj7K iMntk7SehowbxG6LCZEenqgN1183XoH0Hyi3Eukz37Oq1eg1BhOlwxSg9n7nb/Z5Lm 3f3oiI+erviWW3M/w4T4zeUgFVG+Kz4kkd/mz3xs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727604AbgBNAAD (ORCPT ); Thu, 13 Feb 2020 19:00:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:53092 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727594AbgBNAAD (ORCPT ); Thu, 13 Feb 2020 19:00:03 -0500 Received: from tleilax.poochiereds.net (68-20-15-154.lightspeed.rlghnc.sbcglobal.net [68.20.15.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A0C3217F4; Fri, 14 Feb 2020 00:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581638402; bh=UrQXyz0IZ/cGcPKAlIBURYOtW8z0qfZYmQlNNIYIwpc=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=z4nVqULA1zvW6NLruLoW9TDfkuasPT2hrS6aLGCtOeXqKx0DukDj9BzmAfl2IAFJh fo7SKZVY+3L0hXglVoLuoihHFtxO75nN1SiNWXpdrQ7FM2N5Q4ZqnljY5RZCEGbFg4 hKWaD3wDPeavW75hOLdZT8KH8TSY7LNxOaWd0M04= Message-ID: <9988adaa3849d526bfefdebccccef20dc3e7d696.camel@kernel.org> Subject: Re: [PATCH 6/7] ceph: Switch to page_mkwrite_check_truncate in ceph_page_mkwrite From: Jeff Layton To: Andreas Gruenbacher , Alexander Viro , David Sterba , Theodore Ts'o , Chao Yu , Richard Weinberger Cc: linux-fsdevel@vger.kernel.org Date: Thu, 13 Feb 2020 19:00:00 -0500 In-Reply-To: <20200213202423.23455-7-agruenba@redhat.com> References: <20200213202423.23455-1-agruenba@redhat.com> <20200213202423.23455-7-agruenba@redhat.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.3 (3.34.3-1.fc31) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Thu, 2020-02-13 at 21:24 +0100, Andreas Gruenbacher wrote: > Use the "page has been truncated" logic in page_mkwrite_check_truncate > instead of reimplementing it here. Other than with the existing code, > fail with -EFAULT / VM_FAULT_NOPAGE when page_offset(page) == size here > as well, as should be expected. > > Signed-off-by: Andreas Gruenbacher > Acked-by: Jeff Layton > --- > 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 7ab616601141..ef958aa4adb4 100644 > --- a/fs/ceph/addr.c > +++ b/fs/ceph/addr.c > @@ -1575,7 +1575,7 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf) > do { > lock_page(page); > > - if ((off > size) || (page->mapping != inode->i_mapping)) { > + if (page_mkwrite_check_truncate(page, inode) < 0) { > unlock_page(page); > ret = VM_FAULT_NOPAGE; > break; Thanks Andreas. Merged into the ceph-client/testing branch and should make v5.7. Thanks, -- Jeff Layton