Merge branch 'xfs-misc-fixes-1-for-3.16' into for-next

This commit is contained in:
Dave Chinner
2014-05-15 09:38:15 +10:00
13 changed files with 142 additions and 268 deletions

View File

@@ -278,9 +278,10 @@ xfs_qm_scall_trunc_qfiles(
xfs_mount_t *mp,
uint flags)
{
int error;
int error = EINVAL;
if (!xfs_sb_version_hasquota(&mp->m_sb) || flags == 0) {
if (!xfs_sb_version_hasquota(&mp->m_sb) || flags == 0 ||
(flags & ~XFS_DQ_ALLTYPES)) {
xfs_debug(mp, "%s: flags=%x m_qflags=%x",
__func__, flags, mp->m_qflags);
return XFS_ERROR(EINVAL);