[pnfs] white spaces in linux-pnfs-2.6-latest.git

[William A. (Andy) Adamson]

The pnfs and sessions code is sadly lacking in tabs. My hope is that as we
convert to the current code base that this is addressed.

#1 is a fine choice - note that if a 'tab' patch for existing code is
presented the linus tree, #3 would cease to be a problem.

-->Andy

On 9/20/07, Labiaga, Ricardo <Ricardo.Labiaga at netapp.com> wrote:
>
> I'm afraid we introduced this regression during the port through
> cut-and-paste.
> The following ways to fix this come to mind:
>
> 1) The simplest, and possibly best solution long term is to clean up all
> of the tab indentation in the server and RPC code.  Our team (since we
> introduced the problem) can submit a patch to Trond and Bruce that
> cleans up the existing spaces in Linus' tree.  In addition we would fix
> the v4.1 specific instances in our 2.6-pnfs-latest tree.  After both
> patches are applied, we end up with a clean tab indentation server.
>
> 2) An alternative would be to go back and change *only* the v4.1 spaces
> in our 2.6-pnfs-latest to tabs.  This is a lot more work with no clear
> benefit, since we need to restore it to a known "broken" state (as of
> 2.6.18).
>
> 3) We only fix the indentation in the 2.6-pnfs-latest tree.  The problem
> is that it would lead to more frequent merge conflicts when things
> change in Linus' tree.
>
> Our vote is for #1.  In the name of the team, apologies for the added
> pain.
>
> Thoughts?
>
> - ricardo
>
>
>
> > -----Original Message-----
> > From: Benny Halevy [mailto:bhalevy at panasas.com]
> > Sent: Thursday, September 20, 2007 2:10 PM
> > To: Labiaga, Ricardo; Myklebust, Trond; J. Bruce Fields;
> > William A.(Andy) Adamson
> > Cc: pnfs at linux-nfs.org
> > Subject: white spaces in linux-pnfs-2.6-latest.git
> >
> > Ricardo,
> >
> > I tried applying some patches I prepared for the 2.6.18.3 tree
> > onto your 2.6.23-rc6 tree and it looks like they differ in white space
> > (e.g. fs/nfsd/nfs4state.c)
> >
> > When we started working on 2.6.18 we decided we will use the current
> > linux kernel coding style for new code and therefore the patches
> > we made use tab characters for indentation. That said, we also decided
> > to defer cleaning up white spaces in existing code in a minimalistic
> > approach.
> >
> > Did you guys convert tab indents to spaces when you pulled
> > over the patches from the 2.6.18.3 tree?
> > If so, it seems like a step back in the wrong direction
> > and makes patching both trees concurrently harder...
> >
> > Trond/Bruce/Andy: is there still a plan to clean up the existing
> > code base, at least with respect to tab indentation?
> >
> > Benny
> >
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://linux-nfs.org/pipermail/pnfs/attachments/20070921/dfc2db56/attachment-0001.htm