diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-31 15:12:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-31 15:12:49 -0400 |
| commit | a80a66caf8110fc33af8013353fe0da0ae553a13 (patch) | |
| tree | 35cf3ba9ccba371b2e2752cd5cbfc8c3a428f1ea /fs/xfs/linux-2.6/xfs_quotaops.c | |
| parent | bf699c9bac124f0a095d8ef06f2d6b219300a822 (diff) | |
| parent | c7ff91d722e44c98504e6e2c357b47e1988dfbbd (diff) | |
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
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_quotaops.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_quotaops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_quotaops.c b/fs/xfs/linux-2.6/xfs_quotaops.c index 9e41f91aa269..3d4a0c84d634 100644 --- a/fs/xfs/linux-2.6/xfs_quotaops.c +++ b/fs/xfs/linux-2.6/xfs_quotaops.c | |||
| @@ -80,7 +80,7 @@ xfs_fs_set_xstate( | |||
| 80 | 80 | ||
| 81 | if (sb->s_flags & MS_RDONLY) | 81 | if (sb->s_flags & MS_RDONLY) |
| 82 | return -EROFS; | 82 | return -EROFS; |
| 83 | if (!XFS_IS_QUOTA_RUNNING(mp)) | 83 | if (op != Q_XQUOTARM && !XFS_IS_QUOTA_RUNNING(mp)) |
| 84 | return -ENOSYS; | 84 | return -ENOSYS; |
| 85 | if (!capable(CAP_SYS_ADMIN)) | 85 | if (!capable(CAP_SYS_ADMIN)) |
| 86 | return -EPERM; | 86 | return -EPERM; |