diff options
Diffstat (limited to 'fs/quota/dquot.c')
-rw-r--r-- | fs/quota/dquot.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 4881db32e56d..4a37b8e32b4e 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c | |||
@@ -243,7 +243,8 @@ static inline void remove_dquot_hash(struct dquot *dquot) | |||
243 | hlist_del_init(&dquot->dq_hash); | 243 | hlist_del_init(&dquot->dq_hash); |
244 | } | 244 | } |
245 | 245 | ||
246 | static inline struct dquot *find_dquot(unsigned int hashent, struct super_block *sb, unsigned int id, int type) | 246 | static struct dquot *find_dquot(unsigned int hashent, struct super_block *sb, |
247 | unsigned int id, int type) | ||
247 | { | 248 | { |
248 | struct hlist_node *node; | 249 | struct hlist_node *node; |
249 | struct dquot *dquot; | 250 | struct dquot *dquot; |
@@ -935,7 +936,7 @@ void dquot_free_reserved_space(struct dquot *dquot, qsize_t number) | |||
935 | dquot->dq_dqb.dqb_rsvspace -= number; | 936 | dquot->dq_dqb.dqb_rsvspace -= number; |
936 | } | 937 | } |
937 | 938 | ||
938 | static inline void dquot_decr_inodes(struct dquot *dquot, qsize_t number) | 939 | static void dquot_decr_inodes(struct dquot *dquot, qsize_t number) |
939 | { | 940 | { |
940 | if (sb_dqopt(dquot->dq_sb)->flags & DQUOT_NEGATIVE_USAGE || | 941 | if (sb_dqopt(dquot->dq_sb)->flags & DQUOT_NEGATIVE_USAGE || |
941 | dquot->dq_dqb.dqb_curinodes >= number) | 942 | dquot->dq_dqb.dqb_curinodes >= number) |
@@ -947,7 +948,7 @@ static inline void dquot_decr_inodes(struct dquot *dquot, qsize_t number) | |||
947 | clear_bit(DQ_INODES_B, &dquot->dq_flags); | 948 | clear_bit(DQ_INODES_B, &dquot->dq_flags); |
948 | } | 949 | } |
949 | 950 | ||
950 | static inline void dquot_decr_space(struct dquot *dquot, qsize_t number) | 951 | static void dquot_decr_space(struct dquot *dquot, qsize_t number) |
951 | { | 952 | { |
952 | if (sb_dqopt(dquot->dq_sb)->flags & DQUOT_NEGATIVE_USAGE || | 953 | if (sb_dqopt(dquot->dq_sb)->flags & DQUOT_NEGATIVE_USAGE || |
953 | dquot->dq_dqb.dqb_curspace >= number) | 954 | dquot->dq_dqb.dqb_curspace >= number) |
@@ -974,7 +975,7 @@ static int warning_issued(struct dquot *dquot, const int warntype) | |||
974 | #ifdef CONFIG_PRINT_QUOTA_WARNING | 975 | #ifdef CONFIG_PRINT_QUOTA_WARNING |
975 | static int flag_print_warnings = 1; | 976 | static int flag_print_warnings = 1; |
976 | 977 | ||
977 | static inline int need_print_warning(struct dquot *dquot) | 978 | static int need_print_warning(struct dquot *dquot) |
978 | { | 979 | { |
979 | if (!flag_print_warnings) | 980 | if (!flag_print_warnings) |
980 | return 0; | 981 | return 0; |
@@ -1109,7 +1110,7 @@ err_out: | |||
1109 | * | 1110 | * |
1110 | * Note that this function can sleep. | 1111 | * Note that this function can sleep. |
1111 | */ | 1112 | */ |
1112 | static inline void flush_warnings(struct dquot * const *dquots, char *warntype) | 1113 | static void flush_warnings(struct dquot *const *dquots, char *warntype) |
1113 | { | 1114 | { |
1114 | int i; | 1115 | int i; |
1115 | 1116 | ||
@@ -1125,7 +1126,7 @@ static inline void flush_warnings(struct dquot * const *dquots, char *warntype) | |||
1125 | } | 1126 | } |
1126 | } | 1127 | } |
1127 | 1128 | ||
1128 | static inline char ignore_hardlimit(struct dquot *dquot) | 1129 | static int ignore_hardlimit(struct dquot *dquot) |
1129 | { | 1130 | { |
1130 | struct mem_dqinfo *info = &sb_dqopt(dquot->dq_sb)->info[dquot->dq_type]; | 1131 | struct mem_dqinfo *info = &sb_dqopt(dquot->dq_sb)->info[dquot->dq_type]; |
1131 | 1132 | ||