diff --git a/[refs] b/[refs] index bf96a1895deb..1ebffbdc7e77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6929f891241d3fe3af01d28503b645e63241e49a +refs/heads/master: dcb30695f2cac86b71417629a6fe8042b4fe2ab2 diff --git a/trunk/include/linux/quotaops.h b/trunk/include/linux/quotaops.h index 3b3346fa657c..e840ca523175 100644 --- a/trunk/include/linux/quotaops.h +++ b/trunk/include/linux/quotaops.h @@ -116,9 +116,6 @@ static inline int sb_any_quota_active(struct super_block *sb) sb_has_quota_active(sb, GRPQUOTA); } -/* For backward compatibility until we remove all users */ -#define sb_any_quota_enabled(sb) sb_any_quota_active(sb) - /* * Operations supported for diskquotas. */ @@ -267,9 +264,6 @@ static inline int sb_any_quota_active(struct super_block *sb) return 0; } -/* For backward compatibility until we remove all users */ -#define sb_any_quota_enabled(sb) sb_any_quota_active(sb) - /* * NO-OP when quota not configured. */