From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936356AbXGSI3H (ORCPT ); Thu, 19 Jul 2007 04:29:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759213AbXGSI2u (ORCPT ); Thu, 19 Jul 2007 04:28:50 -0400 Received: from pentafluge.infradead.org ([213.146.154.40]:46319 "EHLO pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758954AbXGSI2s (ORCPT ); Thu, 19 Jul 2007 04:28:48 -0400 Date: Thu, 19 Jul 2007 09:28:38 +0100 From: Christoph Hellwig To: "J. Bruce Fields" Cc: Andrew Morton , NeilBrown , andros@citi.umich.edu, "J. Bruce Fields" , nfs@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [NFS] [PATCH 4/5] knfsd: move EX_RDONLY out of header Message-ID: <20070719082838.GA2507@infradead.org> Mail-Followup-To: Christoph Hellwig , "J. Bruce Fields" , Andrew Morton , NeilBrown , andros@citi.umich.edu, "J. Bruce Fields" , nfs@lists.sourceforge.net, linux-kernel@vger.kernel.org References: <2ac9f179334dc7894bb58b1c2fb62837a07fbbdf.1184798679.git.bfields@citi.umich.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i X-SRS-Rewrite: SMTP reverse-path rewritten from by pentafluge.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 18, 2007 at 06:57:29PM -0400, J. Bruce Fields wrote: > From: J. Bruce Fields > > EX_RDONLY is only called in one place; just put it there. > > Signed-off-by: "J. Bruce Fields" > --- > fs/nfsd/vfs.c | 12 ++++++++++++ > include/linux/nfsd/export.h | 12 ------------ > 2 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c > index 5c97d0e..f2684e5 100644 > --- a/fs/nfsd/vfs.c > +++ b/fs/nfsd/vfs.c > @@ -1797,6 +1797,18 @@ nfsd_statfs(struct svc_rqst *rqstp, struct svc_fh *fhp, struct kstatfs *stat) > return err; > } > > +static inline int EX_RDONLY(struct svc_export *exp, struct svc_rqst *rqstp) > +{ > + struct exp_flavor_info *f; > + struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors; > + > + for (f = exp->ex_flavors; f < end; f++) { > + if (f->pseudoflavor == rqstp->rq_flavor) > + return f->flags & NFSEXP_READONLY; > + } > + return exp->ex_flags & NFSEXP_READONLY; > +} As mentioned last time lease remove the inline qualifier and give it a lower-case name.