Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / fs / xfs / xfs_trans_dquot.c

diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index ce78534..9951701 100644 (file)
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -572,12 +572,16 @@ xfs_quota_warn(
        struct xfs_dquot        *dqp,
        int                     type)
 {
-       /* no warnings for project quotas - we just return ENOSPC later */
+       enum quota_type qtype;
+
        if (dqp->dq_flags & XFS_DQ_PROJ)
-               return;
-       quota_send_warning(make_kqid(&init_user_ns,
-                                    (dqp->dq_flags & XFS_DQ_USER) ?
-                                    USRQUOTA : GRPQUOTA,
+               qtype = PRJQUOTA;
+       else if (dqp->dq_flags & XFS_DQ_USER)
+               qtype = USRQUOTA;
+       else
+               qtype = GRPQUOTA;
+
+       quota_send_warning(make_kqid(&init_user_ns, qtype,
                                     be32_to_cpu(dqp->q_core.d_id)),
                           mp->m_super->s_dev, type);
 }