shrink inode when quota is disabled
Review
Quoted 6 lines · Matt Mackall
struct address_space i_data;(quoted diff) +2
-0+#ifdef CONFIG_QUOTA struct dquot *i_dquot[MAXQUOTAS]; +#endif /* These three should probably be a union */ struct list_head i_devices;
Forgive me if I'm asking a stupid question, but did this actually make a difference in the inode size? On gcc 2.95 and 3.3, if MAXQUOTAS is zero, gcc will silently elide that struct member. (Though it will leave a residue of sorts behind -- it participates as far as structure field alignment is concerned, but that isn't an issue here.) I believe zero-length arrays are actually an ANSI C thing, but I didn't see it in a quick perusal of my K&R.
Or, hmm... <does grep> Oh, MAXQUOTAS is set to 2 unconditionally in include/linux/quota.h. How about putting the #ifdef's in there, and setting it to zero if CONFIG_QUOTA is not set? That'd localize the preprocessor noise.
Like this (compiled with CONFIG_QUOTA unset, but not booted):
Shrink struct inode by two pointers if CONFIG_QUOTA is unset.
include/linux/quota.h +4 -0
@@ -57,7 +57,11 @@#define kb2qb (x) ((x) >> (QUOTABLOCK_BITS-10))#define toqb (x) (((x) + QUOTABLOCK_SIZE - 1) >> QUOTABLOCK_BITS) +#ifdef CONFIG_QUOTA #define MAXQUOTAS 2 +#else +#define MAXQUOTAS 0 +#endif #define USRQUOTA 0/* element used for user quotas */ #define GRPQUOTA 1/* element used for group quotas */
--
Ray Lee ~ http://madrabbit.org