Merge branch 'master' into for-linus

diff --combined fs/xfs/linux-2.6/xfs_quotaops.c
index 9ac8aea91529ed403920f746f9d7f52decc2802f,a184793f239904dc75c0c3acebbb690ff8c6e51b..067cafbfc6357fee83a5adbf265e74ab93eeb999
--- 1/fs/xfs/linux-2.6/xfs_quotaops.c
--- 2/fs/xfs/linux-2.6/xfs_quotaops.c
+++ b/fs/xfs/linux-2.6/xfs_quotaops.c
@@@ -23,7 -23,6 +23,6 @@@
  #include "xfs_ag.h"
  #include "xfs_mount.h"
  #include "xfs_quota.h"
- #include "xfs_log.h"
  #include "xfs_trans.h"
  #include "xfs_bmap_btree.h"
  #include "xfs_inode.h"
@@@ -98,7 -97,7 +97,7 @@@ xfs_fs_set_xstate
  }
  
  STATIC int
 -xfs_fs_get_xquota(
 +xfs_fs_get_dqblk(
        struct super_block      *sb,
        int                     type,
        qid_t                   id,
@@@ -115,7 -114,7 +114,7 @@@
  }
  
  STATIC int
 -xfs_fs_set_xquota(
 +xfs_fs_set_dqblk(
        struct super_block      *sb,
        int                     type,
        qid_t                   id,
@@@ -136,6 -135,6 +135,6 @@@
  const struct quotactl_ops xfs_quotactl_operations = {
        .get_xstate             = xfs_fs_get_xstate,
        .set_xstate             = xfs_fs_set_xstate,
 -      .get_xquota             = xfs_fs_get_xquota,
 -      .set_xquota             = xfs_fs_set_xquota,
 +      .get_dqblk              = xfs_fs_get_dqblk,
 +      .set_dqblk              = xfs_fs_set_dqblk,
  };