diff --git a/[refs] b/[refs] index 0d17fcbb340c..91be70ff6e49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d34aa4d5a3e5d141bb4d07ed5d4bf02d4d4998a +refs/heads/master: c32e026efc1e1a4f9e36babebf123f2b88205b0b diff --git a/trunk/include/linux/quota.h b/trunk/include/linux/quota.h index 52e49dce6584..dcddfb200947 100644 --- a/trunk/include/linux/quota.h +++ b/trunk/include/linux/quota.h @@ -347,6 +347,9 @@ struct quota_info { ((type) == USRQUOTA ? (sb_dqopt(sb)->flags & DQUOT_USR_SUSPENDED) : \ (sb_dqopt(sb)->flags & DQUOT_GRP_SUSPENDED)) +#define sb_any_quota_suspended(sb) (sb_has_quota_suspended(sb, USRQUOTA) | \ + sb_has_quota_suspended(sb, GRPQUOTA)) + int register_quota_format(struct quota_format_type *fmt); void unregister_quota_format(struct quota_format_type *fmt);