Merge rsync://oss.sgi.com/git/xfs-2.6

diff --combined fs/xfs/linux-2.6/xfs_linux.h
index 7d7c878,44eb313..42dc5e4
--- 1/fs/xfs/linux-2.6/xfs_linux.h
--- 2/fs/xfs/linux-2.6/xfs_linux.h
+++ b/fs/xfs/linux-2.6/xfs_linux.h
@@@ -145,10 -145,10 +145,10 @@@ static inline void set_buffer_unwritten
  #define xfs_inherit_nosymlinks        xfs_params.inherit_nosym.val
  #define xfs_rotorstep         xfs_params.rotorstep.val
  
 -#ifndef __smp_processor_id
 -#define __smp_processor_id()  smp_processor_id()
 +#ifndef raw_smp_processor_id
 +#define raw_smp_processor_id()        smp_processor_id()
  #endif
 -#define current_cpu()         __smp_processor_id()
 +#define current_cpu()         raw_smp_processor_id()
  #define current_pid()         (current->pid)
  #define current_fsuid(cred)   (current->fsuid)
  #define current_fsgid(cred)   (current->fsgid)
@@@ -230,8 -230,10 +230,10 @@@
   * field (see the QCMD macro in quota.h).  These macros help keep the
   * code portable - they are not visible from the syscall interface.
   */
- #define Q_XSETGQLIM   XQM_CMD(0x8)    /* set groups disk limits */
- #define Q_XGETGQUOTA  XQM_CMD(0x9)    /* get groups disk limits */
+ #define Q_XSETGQLIM   XQM_CMD(8)      /* set groups disk limits */
+ #define Q_XGETGQUOTA  XQM_CMD(9)      /* get groups disk limits */
+ #define Q_XSETPQLIM   XQM_CMD(10)     /* set projects disk limits */
+ #define Q_XGETPQUOTA  XQM_CMD(11)     /* get projects disk limits */
  
  /* IRIX uses a dynamic sizing algorithm (ndquot = 200 + numprocs*2) */
  /* we may well need to fine-tune this if it ever becomes an issue.  */