From: Alex Elder <aelder@sgi.com>
Date: Fri, 4 Jun 2010 18:22:30 +0000 (-0500)
Subject: Merge branch 'master' into for-linus
X-Git-Tag: v2.6.35-rc2~3^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5;hp=-c

Merge branch 'master' into for-linus
---

1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5
diff --combined fs/xfs/linux-2.6/xfs_quotaops.c
index 9ac8aea91529,a184793f2399..067cafbfc635
--- a/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,
  };