From patchwork Mon May 22 09:58:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Brandenburg X-Patchwork-Id: 9741389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4DE846034C for ; Mon, 22 May 2017 21:01:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 407A02875E for ; Mon, 22 May 2017 21:01:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3427128761; Mon, 22 May 2017 21:01:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.9 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF3302875E for ; Mon, 22 May 2017 21:01:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933708AbdEVVBf (ORCPT ); Mon, 22 May 2017 17:01:35 -0400 Received: from mail-qt0-f181.google.com ([209.85.216.181]:34775 "EHLO mail-qt0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762627AbdEVVAR (ORCPT ); Mon, 22 May 2017 17:00:17 -0400 Received: by mail-qt0-f181.google.com with SMTP id c13so112315986qtc.1 for ; Mon, 22 May 2017 14:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=omnibond-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UnX8It9X7bGkNiZJHMkr4WVrNuhXn3qdRzbIK0/eiDE=; b=x8uuU+l52TfVHwjTqBdY8kit0o/Blx0tOtwtNZlh21FTKDtnJISjhV6EfOHKv01Bnf zZAQgoUx8XmmXky4SnNJQKRHeJJCSzX9UXT087zKHd/50IOozOaHeFSpZ7gNFO2MEImD qxqU8pw+6Am0k6YZjCCJzX7uU4JkydLTnc2ylJJnv20kFdx+3AvG8NnC85Xw2uX2BxpK l77JxH+GTsEpAmqC/WC6FfZOJtRcbBRPwe+gOaoBmcr9bLZhop04wa8p96zDvMrCc9/L FeGqcFoIunPhMPs7krAZ5Qi8bGtp78PllKffx4Y6WEY9qwA4TFQCHe0zeZm9ap5Rm/eb 2tww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UnX8It9X7bGkNiZJHMkr4WVrNuhXn3qdRzbIK0/eiDE=; b=XmNY+EAaCwJpSoIG+cRSbbvcKr7JIuno51fWAQqESTWk8D/3fZUVwXuqaXbFSu1pQV e8FcHX7hrPYIIWSS5BSx50uaYq+BeqcJWor4PmfLvBAJVvbWx7IvuzE4+bW9frXQ3KtZ z1nh2C4W6RtmtwCfL2xrxDRUqpMqXDsa4LrwxWwhr66uGamY1VIGgyTFXSX+ckJ8VKyb nTUmlKC9KPqfWHkBE+Lrab4WgQuUBFcosSexiBvv/lGWEAoIkvaRULiivVwGNXvPO9af kK8L/jrlo476CdjKV9UclpNi8yNU7GgvC539twJ6ZiJdwnT5maFxJ47SAUnjje9r3qV5 MfTA== X-Gm-Message-State: AODbwcDExazlGz0DyThVdXr1Y5Gnmxl5/lZIIJiILxxwqEdRLZF1VsVH qX6myi9aL9rvMeLo X-Received: by 10.237.37.21 with SMTP id v21mr24715012qtc.97.1495486815601; Mon, 22 May 2017 14:00:15 -0700 (PDT) Received: from mkbserver1.clemson.edu ([130.127.148.244]) by smtp.gmail.com with ESMTPSA id z203sm12740113qkb.46.2017.05.22.14.00.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 May 2017 14:00:14 -0700 (PDT) From: Martin Brandenburg To: hubcap@omnibond.com, linux-fsdevel@vger.kernel.org Cc: Martin Brandenburg Subject: [PATCH 06/13] orangefs: remove mapping_nrpages macro Date: Mon, 22 May 2017 05:58:54 -0400 Message-Id: <1495447141-12216-7-git-send-email-martin@omnibond.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1495447141-12216-1-git-send-email-martin@omnibond.com> References: <1495447141-12216-1-git-send-email-martin@omnibond.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Martin Brandenburg --- fs/orangefs/file.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index 9e0d334..0de41a3 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c @@ -599,8 +599,6 @@ static int orangefs_file_mmap(struct file *file, struct vm_area_struct *vma) return generic_file_readonly_mmap(file, vma); } -#define mapping_nrpages(idata) ((idata)->nrpages) - /* * Called to notify the module that there are no more references to * this file (i.e. no processes have it open). @@ -622,7 +620,7 @@ static int orangefs_file_release(struct inode *inode, struct file *file) */ if (file_inode(file) && file_inode(file)->i_mapping && - mapping_nrpages(&file_inode(file)->i_data)) { + file_inode(file)->i_mapping->nrpages) { if (orangefs_features & ORANGEFS_FEATURE_READAHEAD) { gossip_debug(GOSSIP_INODE_DEBUG, "calling flush_racache on %pU\n",