Merge branch 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs

* 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs:
  xfs: fix xfs_quota remove error
  xfs: free temporary cursor in xfs_dialloc

diff --combined fs/xfs/linux-2.6/xfs_quotaops.c
index 9e41f91aa269f392ae4eb00490b785e21d74049d,13cc7b524d6e6fc32dcd9167cfff93548135e984..3d4a0c84d634f947f36eb3bad04128cbc603f17d
--- 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
@@@ -80,7 -80,7 +80,7 @@@ xfs_fs_set_xstate
  
        if (sb->s_flags & MS_RDONLY)
                return -EROFS;
-       if (!XFS_IS_QUOTA_RUNNING(mp))
+       if (op != Q_XQUOTARM && !XFS_IS_QUOTA_RUNNING(mp))
                return -ENOSYS;
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
@@@ -150,7 -150,7 +150,7 @@@ xfs_fs_set_xquota
        return -xfs_qm_scall_setqlim(mp, id, xfs_quota_type(type), fdq);
  }
  
 -struct quotactl_ops xfs_quotactl_operations = {
 +const struct quotactl_ops xfs_quotactl_operations = {
        .quota_sync             = xfs_fs_quota_sync,
        .get_xstate             = xfs_fs_get_xstate,
        .set_xstate             = xfs_fs_set_xstate,