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

Trond Myklebust Trond.Myklebust at netapp.com
Fri Sep 21 08:50:30 EDT 2007


On Thu, 2007-09-20 at 18:56 -0700, Labiaga, Ricardo 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?

In case I wasn't clear:

 Patches with large amounts of whitespace errors (large == so many that
they cannot be fixed up by me by hand) will be rejected. I'm not going
to accept a solution that first introduces errors, then removes them.
The main reason is that utilities like 'lindent' tend to do a lot of
other useless and screwed up reformatting that needs to be cleaned up
afterwards too.

Trond


More information about the pNFS mailing list