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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 3B8FEC432C0 for ; Fri, 22 Nov 2019 08:54:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0047020708 for ; Fri, 22 Nov 2019 08:54:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YcyPV8ri" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727118AbfKVIyP (ORCPT ); Fri, 22 Nov 2019 03:54:15 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:41741 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726546AbfKVIyP (ORCPT ); Fri, 22 Nov 2019 03:54:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574412854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dPGQOfABvktYphzs0ypCJBGv3QqQ358wkiKWnHzjexs=; b=YcyPV8ripy/Zn8viE5vCltG/7Ad/BNBSbbS7ntbj0TloAxtiLWTgNWp7EAJIbbowUbffDO 90ixIjyg2q3iCNBKFYEVAB5lPZbc5SGTGgC83OYTDagWF8vpK1j7F1JpmwqERGvtqac2Pp mrwQMVh3r9AjZilhNsgxNtWMBIAxUW4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-402-PuQeQ0McPl-LRRrY6p-OfQ-1; Fri, 22 Nov 2019 03:53:31 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE5581800D41; Fri, 22 Nov 2019 08:53:29 +0000 (UTC) Received: from orion.redhat.com (unknown [10.40.205.178]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB81F608F3; Fri, 22 Nov 2019 08:53:28 +0000 (UTC) From: Carlos Maiolino To: linux-fsdevel@vger.kernel.org Cc: hch@lst.de, darrick.wong@oracle.com, sandeen@sandeen.net Subject: [PATCH 3/5] ecryptfs: drop direct calls to ->bmap Date: Fri, 22 Nov 2019 09:53:18 +0100 Message-Id: <20191122085320.124560-4-cmaiolino@redhat.com> In-Reply-To: <20191122085320.124560-1-cmaiolino@redhat.com> References: <20191122085320.124560-1-cmaiolino@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: PuQeQ0McPl-LRRrY6p-OfQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Replace direct ->bmap calls by bmap() method. Reviewed-by: Christoph Hellwig Signed-off-by: Carlos Maiolino --- fs/ecryptfs/mmap.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c index cffa0c1ec829..019572c6b39a 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c @@ -524,16 +524,12 @@ static int ecryptfs_write_end(struct file *file, =20 static sector_t ecryptfs_bmap(struct address_space *mapping, sector_t bloc= k) { -=09int rc =3D 0; -=09struct inode *inode; -=09struct inode *lower_inode; - -=09inode =3D (struct inode *)mapping->host; -=09lower_inode =3D ecryptfs_inode_to_lower(inode); -=09if (lower_inode->i_mapping->a_ops->bmap) -=09=09rc =3D lower_inode->i_mapping->a_ops->bmap(lower_inode->i_mapping, -=09=09=09=09=09=09=09 block); -=09return rc; +=09struct inode *lower_inode =3D ecryptfs_inode_to_lower(mapping->host); +=09int ret =3D bmap(lower_inode, &block); + +=09if (ret) +=09=09return 0; +=09return block; } =20 const struct address_space_operations ecryptfs_aops =3D { --=20 2.23.0