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=-8.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=unavailable 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 CF21BC43219 for ; Tue, 30 Apr 2019 15:15:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99CA620835 for ; Tue, 30 Apr 2019 15:15:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="jYPe92SQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726343AbfD3PP1 (ORCPT ); Tue, 30 Apr 2019 11:15:27 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:48768 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725942AbfD3PP1 (ORCPT ); Tue, 30 Apr 2019 11:15:27 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3UF9cQU106361; Tue, 30 Apr 2019 15:14:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2018-07-02; bh=gu8MWvTYCi41J/gN2asvVGcjr6fDPYUJLpVtB5eyYmw=; b=jYPe92SQ/dw7NPBvK6P/ZdX211I0o4yDoMNvZte4PxbH1Qh7YcNVmW2IVLKUN5xxiLN8 Vz03hnDRk2bvbX5hRKegFA6gayRf6Wo3k3+mBR7VCtCuhsRkeq2rEjvI/sNJ4GpefMxz aA2vdG+xl6EHzGqFJu8Ch/SfHTQXjNZlpLAB8GWj+WwXmVNLzW4KsMmqH5vO38i6PANr oSr37bCkhgfWsOfvPT2eDZvSAhRHBt4wlxn1f55KfeiCTeWhBTyOMGiiSWkglhCXpFpp Pwnf36X9WBo9GnM9/5JFcf58OC+N1pGSv+kc6UxBRB38xHBUZa/INn+/5H0DfY6M5COK Ww== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2130.oracle.com with ESMTP id 2s4ckdderp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Apr 2019 15:14:53 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3UFEgdi059434; Tue, 30 Apr 2019 15:14:53 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserp3030.oracle.com with ESMTP id 2s4d4ajx7k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Apr 2019 15:14:53 +0000 Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x3UFEnaZ020024; Tue, 30 Apr 2019 15:14:49 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 30 Apr 2019 08:14:49 -0700 Date: Tue, 30 Apr 2019 08:14:46 -0700 From: "Darrick J. Wong" To: Andreas Gruenbacher Cc: cluster-devel@redhat.com, Christoph Hellwig , Bob Peterson , Jan Kara , Dave Chinner , Ross Lagerwall , Mark Syms , Edwin =?iso-8859-1?B?VPZy9ms=?= , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v7 1/5] iomap: Clean up __generic_write_end calling Message-ID: <20190430151446.GB5200@magnolia> References: <20190429220934.10415-1-agruenba@redhat.com> <20190429220934.10415-2-agruenba@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190429220934.10415-2-agruenba@redhat.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9242 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904300094 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9242 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904300094 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Tue, Apr 30, 2019 at 12:09:30AM +0200, Andreas Gruenbacher wrote: > From: Christoph Hellwig > > Move the call to __generic_write_end into iomap_write_end instead of > duplicating it in each of the three branches. This requires open coding > the generic_write_end for the buffer_head case. > > Signed-off-by: Christoph Hellwig > Signed-off-by: Andreas Gruenbacher > Reviewed-by: Jan Kara Looks ok, Reviewed-by: Darrick J. Wong --D > --- > fs/iomap.c | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > > diff --git a/fs/iomap.c b/fs/iomap.c > index 97cb9d486a7d..2344c662e6fc 100644 > --- a/fs/iomap.c > +++ b/fs/iomap.c > @@ -738,13 +738,11 @@ __iomap_write_end(struct inode *inode, loff_t pos, unsigned len, > * uptodate page as a zero-length write, and force the caller to redo > * the whole thing. > */ > - if (unlikely(copied < len && !PageUptodate(page))) { > - copied = 0; > - } else { > - iomap_set_range_uptodate(page, offset_in_page(pos), len); > - iomap_set_page_dirty(page); > - } > - return __generic_write_end(inode, pos, copied, page); > + if (unlikely(copied < len && !PageUptodate(page))) > + return 0; > + iomap_set_range_uptodate(page, offset_in_page(pos), len); > + iomap_set_page_dirty(page); > + return copied; > } > > static int > @@ -761,7 +759,6 @@ iomap_write_end_inline(struct inode *inode, struct page *page, > kunmap_atomic(addr); > > mark_inode_dirty(inode); > - __generic_write_end(inode, pos, copied, page); > return copied; > } > > @@ -774,12 +771,13 @@ iomap_write_end(struct inode *inode, loff_t pos, unsigned len, > if (iomap->type == IOMAP_INLINE) { > ret = iomap_write_end_inline(inode, page, iomap, pos, copied); > } else if (iomap->flags & IOMAP_F_BUFFER_HEAD) { > - ret = generic_write_end(NULL, inode->i_mapping, pos, len, > - copied, page, NULL); > + ret = block_write_end(NULL, inode->i_mapping, pos, len, copied, > + page, NULL); > } else { > ret = __iomap_write_end(inode, pos, len, copied, page, iomap); > } > > + ret = __generic_write_end(inode, pos, ret, page); > if (iomap->page_done) > iomap->page_done(inode, pos, copied, page, iomap); > > -- > 2.20.1 >