[GIT PULL] XFS update for 3.1-rc4

[GIT PULL] XFS update for 3.1-rc4

[Alex Elder]

Linus, please pull the following XFS changes.  Their effect is to
remove the subdirectory structure from the XFS source hierarchy.
There are no functional changes to the XFS code itself.  Thanks.

					-Alex

The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c:

  Linux 3.1-rc3 (2011-08-22 11:42:53 -0700)

are available in the git repository at:
  git://oss.sgi.com/xfs/xfs for-linus

Alex Elder (1):
      xfs: don't expect xfs headers to be in subdirectories

Christoph Hellwig (2):
      xfs: remove subdirectories
      xfs: fix tracing builds inside the source tree

 fs/xfs/Makefile                       |  119 ++++++++++++++++-----------------
 fs/xfs/{linux-2.6 => }/kmem.c         |    0
 fs/xfs/{linux-2.6 => }/kmem.h         |    0
 fs/xfs/{linux-2.6 => }/mrlock.h       |    0
 fs/xfs/{linux-2.6 => }/time.h         |    0
 fs/xfs/{support => }/uuid.c           |    0
 fs/xfs/{support => }/uuid.h           |    0
 fs/xfs/xfs.h                          |    3 +-
 fs/xfs/{linux-2.6 => }/xfs_acl.c      |    0
 fs/xfs/{linux-2.6 => }/xfs_aops.c     |    0
 fs/xfs/{linux-2.6 => }/xfs_aops.h     |    0
 fs/xfs/{linux-2.6 => }/xfs_buf.c      |    0
 fs/xfs/{linux-2.6 => }/xfs_buf.h      |    0
 fs/xfs/{linux-2.6 => }/xfs_discard.c  |    0
 fs/xfs/{linux-2.6 => }/xfs_discard.h  |    0
 fs/xfs/{quota => }/xfs_dquot.c        |    0
 fs/xfs/{quota => }/xfs_dquot.h        |    0
 fs/xfs/{quota => }/xfs_dquot_item.c   |    0
 fs/xfs/{quota => }/xfs_dquot_item.h   |    0
 fs/xfs/{linux-2.6 => }/xfs_export.c   |    0
 fs/xfs/{linux-2.6 => }/xfs_export.h   |    0
 fs/xfs/{linux-2.6 => }/xfs_file.c     |    0
 fs/xfs/{linux-2.6 => }/xfs_fs_subr.c  |    0
 fs/xfs/{linux-2.6 => }/xfs_globals.c  |    0
 fs/xfs/{linux-2.6 => }/xfs_ioctl.c    |    0
 fs/xfs/{linux-2.6 => }/xfs_ioctl.h    |    0
 fs/xfs/{linux-2.6 => }/xfs_ioctl32.c  |    0
 fs/xfs/{linux-2.6 => }/xfs_ioctl32.h  |    0
 fs/xfs/{linux-2.6 => }/xfs_iops.c     |    0
 fs/xfs/{linux-2.6 => }/xfs_iops.h     |    0
 fs/xfs/{linux-2.6 => }/xfs_linux.h    |   27 ++++----
 fs/xfs/{linux-2.6 => }/xfs_message.c  |    0
 fs/xfs/{linux-2.6 => }/xfs_message.h  |    0
 fs/xfs/{quota => }/xfs_qm.c           |    0
 fs/xfs/{quota => }/xfs_qm.h           |    0
 fs/xfs/{quota => }/xfs_qm_bhv.c       |    0
 fs/xfs/{quota => }/xfs_qm_stats.c     |    0
 fs/xfs/{quota => }/xfs_qm_stats.h     |    0
 fs/xfs/{quota => }/xfs_qm_syscalls.c  |    0
 fs/xfs/{quota => }/xfs_quota_priv.h   |    0
 fs/xfs/{linux-2.6 => }/xfs_quotaops.c |    2 +-
 fs/xfs/{linux-2.6 => }/xfs_stats.c    |    0
 fs/xfs/{linux-2.6 => }/xfs_stats.h    |    0
 fs/xfs/{linux-2.6 => }/xfs_super.c    |    0
 fs/xfs/{linux-2.6 => }/xfs_super.h    |    0
 fs/xfs/{linux-2.6 => }/xfs_sync.c     |    0
 fs/xfs/{linux-2.6 => }/xfs_sync.h     |    0
 fs/xfs/{linux-2.6 => }/xfs_sysctl.c   |    0
 fs/xfs/{linux-2.6 => }/xfs_sysctl.h   |    0
 fs/xfs/{linux-2.6 => }/xfs_trace.c    |    4 +-
 fs/xfs/{linux-2.6 => }/xfs_trace.h    |    0
 fs/xfs/{quota => }/xfs_trans_dquot.c  |    0
 fs/xfs/{linux-2.6 => }/xfs_vnode.h    |    0
 fs/xfs/{linux-2.6 => }/xfs_xattr.c    |    0
 kernel/sysctl_binary.c                |    2 +-
 kernel/sysctl_check.c                 |    2 +-
 56 files changed, 78 insertions(+), 81 deletions(-)
 rename fs/xfs/{linux-2.6 => }/kmem.c (100%)
 rename fs/xfs/{linux-2.6 => }/kmem.h (100%)
 rename fs/xfs/{linux-2.6 => }/mrlock.h (100%)
 rename fs/xfs/{linux-2.6 => }/time.h (100%)
 rename fs/xfs/{support => }/uuid.c (100%)
 rename fs/xfs/{support => }/uuid.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_acl.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_aops.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_aops.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_buf.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_buf.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_discard.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_discard.h (100%)
 rename fs/xfs/{quota => }/xfs_dquot.c (100%)
 rename fs/xfs/{quota => }/xfs_dquot.h (100%)
 rename fs/xfs/{quota => }/xfs_dquot_item.c (100%)
 rename fs/xfs/{quota => }/xfs_dquot_item.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_export.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_export.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_file.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_fs_subr.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_globals.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_ioctl.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_ioctl.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_iops.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_iops.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_linux.h (96%)
 rename fs/xfs/{linux-2.6 => }/xfs_message.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_message.h (100%)
 rename fs/xfs/{quota => }/xfs_qm.c (100%)
 rename fs/xfs/{quota => }/xfs_qm.h (100%)
 rename fs/xfs/{quota => }/xfs_qm_bhv.c (100%)
 rename fs/xfs/{quota => }/xfs_qm_stats.c (100%)
 rename fs/xfs/{quota => }/xfs_qm_stats.h (100%)
 rename fs/xfs/{quota => }/xfs_qm_syscalls.c (100%)
 rename fs/xfs/{quota => }/xfs_quota_priv.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_quotaops.c (99%)
 rename fs/xfs/{linux-2.6 => }/xfs_stats.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_stats.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_super.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_super.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_sync.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_sync.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_sysctl.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_sysctl.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_trace.c (96%)
 rename fs/xfs/{linux-2.6 => }/xfs_trace.h (100%)
 rename fs/xfs/{quota => }/xfs_trans_dquot.c (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_vnode.h (100%)
 rename fs/xfs/{linux-2.6 => }/xfs_xattr.c (100%)

Re: [GIT PULL] XFS update for 3.1-rc4

[Linus Torvalds]

On Tue, Aug 23, 2011 at 10:39 AM, Alex Elder <aelder@sgi.com> wrote:
>
> Linus, please pull the following XFS changes.  Their effect is to
> remove the subdirectory structure from the XFS source hierarchy.
> There are no functional changes to the XFS code itself.  Thanks.

Pulled.

Any plans to further sanitize the namespace?

It's kind of crazy to have filenames like

   fs/xfs/xfs_trace.c

which just duplicate the "xfs" part for no good reason. Why not just
do something like

  for i in xfs_*; do j=$(echo $i | sed 's/^xfs_//'); git mv $i $j; done

to get rid of the silly "xfs_" prefix that adds nothing?

You could use the bytes you save to rename "qm.c" to "quota_manager.c"
instead. Wouldn't it be nice to have *good* names, instead of a jumble
of crazy and mostly redundant letters?

                        Linus

Re: [GIT PULL] XFS update for 3.1-rc4

[Alex Elder]

On Tue, 2011-08-23 at 11:46 -0700, Linus Torvalds wrote:
> On Tue, Aug 23, 2011 at 10:39 AM, Alex Elder <aelder@sgi.com> wrote:
> >
> > Linus, please pull the following XFS changes.  Their effect is to
> > remove the subdirectory structure from the XFS source hierarchy.
> > There are no functional changes to the XFS code itself.  Thanks.
> 
> Pulled.
> 
> Any plans to further sanitize the namespace?

We haven't discussed it but it's not a bad idea.

> It's kind of crazy to have filenames like
> 
>    fs/xfs/xfs_trace.c
> 
> which just duplicate the "xfs" part for no good reason. Why not just
> do something like
> 
>   for i in xfs_*; do j=$(echo $i | sed 's/^xfs_//'); git mv $i $j; done
> 
> to get rid of the silly "xfs_" prefix that adds nothing?
> 
> You could use the bytes you save to rename "qm.c" to "quota_manager.c"
> instead. Wouldn't it be nice to have *good* names, instead of a jumble
> of crazy and mostly redundant letters?

We're getting there, gradually.  The code is certainly
evolving in that direction, though that hasn't happened
in the file names.  Doing that would require my fingers
to get used to skipping over the "xfs_" spasm though...

					-Alex

Re: [GIT PULL] XFS update for 3.1-rc4

[Dave Chinner]

On Tue, Aug 23, 2011 at 11:46:30AM -0700, Linus Torvalds wrote:
> On Tue, Aug 23, 2011 at 10:39 AM, Alex Elder <aelder@sgi.com> wrote:
> >
> > Linus, please pull the following XFS changes.  Their effect is to
> > remove the subdirectory structure from the XFS source hierarchy.
> > There are no functional changes to the XFS code itself.  Thanks.
> 
> Pulled.
> 
> Any plans to further sanitize the namespace?
> 
> It's kind of crazy to have filenames like
> 
>    fs/xfs/xfs_trace.c
> 
> which just duplicate the "xfs" part for no good reason.

I consider the context it adds to cscope searches a damn good reason
for keeping it.

> Why not just
> do something like
> 
>   for i in xfs_*; do j=$(echo $i | sed 's/^xfs_//'); git mv $i $j; done
> 
> to get rid of the silly "xfs_" prefix that adds nothing?

Because that then kills context that is actually useful in cscope
searches. That is, every filesystem has the file "inode.c",
"super.c", etc and so you can't tell from the cscope searchs which
filesystem function calls belong to. 

Duplicate name spaces are evil, and we have a lot of them in the
filesystem tree - if they all had explicit namespacing like XFS
does, then the world would be a better place. ;)


> You could use the bytes you save to rename "qm.c" to "quota_manager.c"
> instead. Wouldn't it be nice to have *good* names, instead of a jumble
> of crazy and mostly redundant letters?

The names make sense to anyone who has spent any time in the XFS
code. The name of the file reflects the namespace of the code inside
the file itself. e.g. to use the xfs_qm.c as an example:

$ grep ^xfs_qm_  fs/xfs/xfs_qm.c
xfs_qm_destroy(
xfs_qm_hold_quotafs_ref(
xfs_qm_rele_quotafs_ref(
xfs_qm_unmount(
xfs_qm_mount_quotas(
xfs_qm_unmount_quotas(
xfs_qm_dqflush_all(
xfs_qm_detach_gdquots(
xfs_qm_dqpurge_int(
xfs_qm_dqpurge_all(
xfs_qm_dqattach_one(
xfs_qm_dqattach_grouphint(
xfs_qm_dqattach_locked(
xfs_qm_dqattach(
xfs_qm_dqdetach(
xfs_qm_sync(
xfs_qm_init_quotainfo(
xfs_qm_destroy_quotainfo(
xfs_qm_list_init(
xfs_qm_list_destroy(
xfs_qm_qino_alloc(
xfs_qm_reset_dqcounts(
xfs_qm_dqiter_bufs(
xfs_qm_dqiterate(
xfs_qm_quotacheck_dqadjust(
xfs_qm_get_rtblks(
xfs_qm_dqusage_adjust(
xfs_qm_quotacheck(
xfs_qm_init_quotainos(
xfs_qm_dqreclaim_one(void)
xfs_qm_shake_freelist(
xfs_qm_shake_scan(
xfs_qm_shake_count(
xfs_qm_dqalloc_incore(
xfs_qm_write_sb_changes(
xfs_qm_vop_dqalloc(
xfs_qm_vop_chown(
xfs_qm_vop_chown_reserve(
xfs_qm_vop_rename_dqattach(
xfs_qm_vop_create_dqattach(

So there is a certain methodic sanity to the naming convention that
is not immediately obvious from just looking at the file names, and
that's a good reason not to change them.

Besides, I don't want to have to spend 3 months reprogramming
my muscle memory just because we painted the bikeshed a different
colour. ;)

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

Re: [GIT PULL] XFS update for 3.1-rc4

[Linus Torvalds]

On Tue, Aug 23, 2011 at 5:42 PM, Dave Chinner <david@fromorbit.com> wrote:
>
> I consider the context it adds to cscope searches a damn good reason
> for keeping it.

Umm. I suggest you start learning to use the tools you have, rather
than blame your inability to use them for then making crap decisions
in file naming.

Read up on the "-pN" thing to cscope.

So here's a trick of the day:

  export CSCOPEOPTIONS=-p2

or something like that. And stop using crap to excuse bad decisions.

                      Linus

Re: [GIT PULL] XFS update for 3.1-rc4

[Dave Chinner]

On Tue, Aug 23, 2011 at 05:59:46PM -0700, Linus Torvalds wrote:
> On Tue, Aug 23, 2011 at 5:42 PM, Dave Chinner <david@fromorbit.com> wrote:
> >
> > I consider the context it adds to cscope searches a damn good reason
> > for keeping it.
> 
> Umm. I suggest you start learning to use the tools you have, rather
> than blame your inability to use them for then making crap decisions
> in file naming.

If you're passing judgement on the XFS filenaming convention, then
don't blame me - way before my time.  e.g. the two initial XFS
commits from 29 October, 1993 show exactly the same names as we
currently use:

http://oss.sgi.com/cgi-bin/gitweb.cgi?p=archive/xfs-import.git;a=commitdiff;h=67e682e44dd02a2a0efaa0ed2579894325010a85
http://oss.sgi.com/cgi-bin/gitweb.cgi?p=archive/xfs-import.git;a=commitdiff;h=ec2b385b4b79e3967e1e0480fb1863ba029f6c30

So perhaps you might want to go hunt down the original XFS
developers. They'd probably just laugh at you, though.

Regardless, changing the filenames now is a bad idea. Plenty of
people are familiar with what they mean and what they contain, and
changing them just means everyone has to relearn where stuff is. We
lose the simple solution to the question "what file does that
function exist in" and deciding where to put new code becomes harder
because it's not as clear what the overall scope of each file is
supposed to be.  It will also make code archeology during bug triage
harder as well.  That doesn't improve anything for anyone in the
short term - it will only slow us down.

And in the long term, a major rename makes things like backports to
stable kernels harder, more time consuming and more error prone due
to the extra transformations that need to take place for each patch.
That's two strikes.

Then there is also the userspace tools that share a bunch of the
kernel code that we have to keep in sync. Hence renaming the kernel
files means we'll make a bunch of work for ourselves in userspace as
well to keep that in sync. Strike Three.

So really, I can't see any good reason to change the XFS file names.

> Read up on the "-pN" thing to cscope.

I learnt about that in 2002.

However, if you ever used cscope with the -pN option on a source
tree with long verbose filenames (like you suggest) and functions on
a 80-90 column terminal, you'd understand that these shift the code
context output (the most important bit of the cscope output) so far
across the terminal that it line wraps 3 or 4 times and is
completely unreadable.....

> So here's a trick of the day:
> 
>   export CSCOPEOPTIONS=-p2
>
> or something like that.

Sure. You need to wrap it in an alias because cscope doesn't have a
magic environment variable or config file to set default options.

Of course, the obvious logical extension of that is to then hook up
a script to PROMPT_COMMAND or aliasing cd/pushd/popd (or cwdcmd for
tcsh) so that $CSCOPEOPTIONS changes automatically depending on the
source tree you are currently working in.

That would require learning a bit about the tools you use every day,
though. I learnt this trick in 2003..... :P

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com