The following commit has been merged in the linux branch: commit a80a66caf8110fc33af8013353fe0da0ae553a13 Merge: bf699c9bac124f0a095d8ef06f2d6b219300a822 c7ff91d722e44c98504e6e2c357b47e1988dfbbd Author: Linus Torvalds torvalds@linux-foundation.org Date: Sat Oct 31 12:12:49 2009 -0700
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 9e41f91,13cc7b5..3d4a0c8 --- a/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,