From: Alex Zhuravlev Date: Thu, 14 May 2020 06:22:45 +0000 (+0300) Subject: LU-13557 quota: remove inline declarations X-Git-Tag: 2.13.54~4 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=c6249b88a2adf2b4f0d661c4286812e9eae0c18a;ds=sidebyside LU-13557 quota: remove inline declarations which can't be really used given function budies aren't in .h file Fixes: 09f9fb3211 ("LU-11023 quota: quota pools for OSTs") Signed-off-by: Alex Zhuravlev Change-Id: Ia8bb5d04185ec6a779c872a9825c23034030e605 Reviewed-on: https://review.whamcloud.com/38595 Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Tested-by: jenkins Reviewed-by: Neil Brown Tested-by: Maloo Reviewed-by: Sergey Cheremencev Reviewed-by: Oleg Drokin --- diff --git a/lustre/quota/qmt_entry.c b/lustre/quota/qmt_entry.c index de9a314..c0e8724 100644 --- a/lustre/quota/qmt_entry.c +++ b/lustre/quota/qmt_entry.c @@ -857,7 +857,7 @@ void qmt_revalidate_lqes(const struct lu_env *env, } } -inline void qti_lqes_init(const struct lu_env *env) +void qti_lqes_init(const struct lu_env *env) { struct qmt_thread_info *qti = qmt_info(env); @@ -866,7 +866,7 @@ inline void qti_lqes_init(const struct lu_env *env) qti->qti_lqes_num = QMT_MAX_POOL_NUM; } -inline int qti_lqes_add(const struct lu_env *env, struct lquota_entry *lqe) +int qti_lqes_add(const struct lu_env *env, struct lquota_entry *lqe) { struct qmt_thread_info *qti = qmt_info(env); @@ -901,7 +901,7 @@ inline int qti_lqes_add(const struct lu_env *env, struct lquota_entry *lqe) return 0; } -inline void qti_lqes_del(const struct lu_env *env, int index) +void qti_lqes_del(const struct lu_env *env, int index) { struct lquota_entry **lqes; int lqes_cnt = qti_lqes_cnt(env); @@ -925,7 +925,7 @@ inline void qti_lqes_del(const struct lu_env *env, int index) qti_lqes_cnt(env)--; } -inline void qti_lqes_fini(const struct lu_env *env) +void qti_lqes_fini(const struct lu_env *env) { struct qmt_thread_info *qti = qmt_info(env); struct lquota_entry **lqes = qti->qti_lqes; diff --git a/lustre/quota/qmt_internal.h b/lustre/quota/qmt_internal.h index af51f9dd..423cda6 100644 --- a/lustre/quota/qmt_internal.h +++ b/lustre/quota/qmt_internal.h @@ -457,9 +457,9 @@ int qmt_pool_add(struct obd_device *obd, char *poolname, char *ostname); int qmt_pool_rem(struct obd_device *obd, char *poolname, char *ostname); int qmt_pool_del(struct obd_device *obd, char *poolname); -inline struct rw_semaphore *qmt_sarr_rwsem(struct qmt_pool_info *qpi); -inline int qmt_sarr_get_idx(struct qmt_pool_info *qpi, int arr_idx); -inline unsigned int qmt_sarr_count(struct qmt_pool_info *qpi); +struct rw_semaphore *qmt_sarr_rwsem(struct qmt_pool_info *qpi); +int qmt_sarr_get_idx(struct qmt_pool_info *qpi, int arr_idx); +unsigned int qmt_sarr_count(struct qmt_pool_info *qpi); /* qmt_entry.c */ extern struct lquota_entry_operations qmt_lqe_ops; @@ -494,16 +494,16 @@ bool qmt_revalidate(const struct lu_env *, struct lquota_entry *); void qmt_revalidate_lqes(const struct lu_env *, struct qmt_device *, __u32); __u64 qmt_alloc_expand(struct lquota_entry *, __u64, __u64); -inline void qti_lqes_init(const struct lu_env *); -inline int qti_lqes_add(const struct lu_env *, struct lquota_entry *); -inline void qti_lqes_del(const struct lu_env *, int); -inline void qti_lqes_fini(const struct lu_env *); -inline int qti_lqes_min_qunit(const struct lu_env *); -inline int qti_lqes_edquot(const struct lu_env *); -inline int qti_lqes_restore_init(const struct lu_env *env); -inline void qti_lqes_restore_fini(const struct lu_env *env); -inline void qti_lqes_write_lock(const struct lu_env *env); -inline void qti_lqes_write_unlock(const struct lu_env *env); +void qti_lqes_init(const struct lu_env *env); +int qti_lqes_add(const struct lu_env *env, struct lquota_entry *lqe); +void qti_lqes_del(const struct lu_env *env, int index); +void qti_lqes_fini(const struct lu_env *env); +int qti_lqes_min_qunit(const struct lu_env *env); +int qti_lqes_edquot(const struct lu_env *env); +int qti_lqes_restore_init(const struct lu_env *env); +void qti_lqes_restore_fini(const struct lu_env *env); +void qti_lqes_write_lock(const struct lu_env *env); +void qti_lqes_write_unlock(const struct lu_env *env); struct lqe_glbl_data *qmt_alloc_lqe_gd(struct qmt_pool_info *, int); void qmt_free_lqe_gd(struct lqe_glbl_data *);