From d6c9057499fa053e8886f1ebc28d03bd7a765964 Mon Sep 17 00:00:00 2001 From: Liu Xuezhao Date: Sat, 14 Apr 2012 16:29:52 +0800 Subject: [PATCH] LU-1347 lvfs: makes EXPORT_SYMBOL follows function body Makes EXPORT_SYMBOL macros immediately follow the function body, to follow normal Linux kernel coding style. Signed-off-by: Liu Xuezhao Change-Id: Icf63514a8ad173217b55f115b4e4ada695eb9295 Reviewed-on: http://review.whamcloud.com/2838 Tested-by: Hudson Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/lvfs/fsfilt.c | 8 +++----- lustre/lvfs/lustre_quota_fmt.c | 18 ++++++++---------- lustre/lvfs/lvfs_linux.c | 7 +++---- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/lustre/lvfs/fsfilt.c b/lustre/lvfs/fsfilt.c index 84a9721..a915131 100644 --- a/lustre/lvfs/fsfilt.c +++ b/lustre/lvfs/fsfilt.c @@ -81,6 +81,7 @@ int fsfilt_register_ops(struct fsfilt_operations *fs_ops) /* unlock fsfilt_types list */ return 0; } +EXPORT_SYMBOL(fsfilt_register_ops); void fsfilt_unregister_ops(struct fsfilt_operations *fs_ops) { @@ -99,6 +100,7 @@ void fsfilt_unregister_ops(struct fsfilt_operations *fs_ops) } /* unlock fsfilt_types list */ } +EXPORT_SYMBOL(fsfilt_unregister_ops); struct fsfilt_operations *fsfilt_get_ops(const char *type) { @@ -130,14 +132,10 @@ struct fsfilt_operations *fsfilt_get_ops(const char *type) return fs_ops; } +EXPORT_SYMBOL(fsfilt_get_ops); void fsfilt_put_ops(struct fsfilt_operations *fs_ops) { cfs_module_put(fs_ops->fs_owner); } - - -EXPORT_SYMBOL(fsfilt_register_ops); -EXPORT_SYMBOL(fsfilt_unregister_ops); -EXPORT_SYMBOL(fsfilt_get_ops); EXPORT_SYMBOL(fsfilt_put_ops); diff --git a/lustre/lvfs/lustre_quota_fmt.c b/lustre/lvfs/lustre_quota_fmt.c index c28658d..6201f6b 100644 --- a/lustre/lvfs/lustre_quota_fmt.c +++ b/lustre/lvfs/lustre_quota_fmt.c @@ -119,6 +119,7 @@ int lustre_check_quota_file(struct lustre_quota_info *lqi, int type) struct file *f = lqi->qi_files[type]; return check_quota_file(f, NULL, type, lqi->qi_version); } +EXPORT_SYMBOL(lustre_check_quota_file); int lustre_read_quota_file_info(struct file* f, struct lustre_mem_dqinfo* info) { @@ -151,6 +152,7 @@ int lustre_read_quota_info(struct lustre_quota_info *lqi, int type) return lustre_read_quota_file_info(lqi->qi_files[type], &lqi->qi_info[type]); } +EXPORT_SYMBOL(lustre_read_quota_info); /** * Write information header to quota file @@ -175,13 +177,14 @@ int lustre_write_quota_info(struct lustre_quota_info *lqi, int type) LUSTRE_DQINFOOFF); if (size != sizeof(struct lustre_disk_dqinfo)) { - CDEBUG(D_WARNING, + CDEBUG(D_WARNING, "Can't write info structure on device %s.\n", f->f_vfsmnt->mnt_sb->s_id); return -1; } return 0; } +EXPORT_SYMBOL(lustre_write_quota_info); void disk2memdqb(struct lustre_mem_dqblk *m, void *d, lustre_quota_version_t version) @@ -797,7 +800,7 @@ out_buf: /** * Find entry for given id in the tree - wrapper function */ -static inline loff_t find_dqentry(struct lustre_dquot *dquot, +static inline loff_t find_dqentry(struct lustre_dquot *dquot, lustre_quota_version_t version) { return find_tree_dqentry(dquot, LUSTRE_DQTREEOFF, 0, version); @@ -855,6 +858,7 @@ int lustre_read_dquot(struct lustre_dquot *dquot) return ret; } +EXPORT_SYMBOL(lustre_read_dquot); /** * Commit changes of dquot to disk - it might also mean deleting @@ -897,6 +901,7 @@ int lustre_commit_dquot(struct lustre_dquot *dquot) return rc; } +EXPORT_SYMBOL(lustre_commit_dquot); int lustre_init_quota_header(struct lustre_quota_info *lqi, int type, int fakemagics) @@ -951,6 +956,7 @@ int lustre_init_quota_info(struct lustre_quota_info *lqi, int type) { return lustre_init_quota_info_generic(lqi, type, 0); } +EXPORT_SYMBOL(lustre_init_quota_info); static int walk_block_dqentry(struct file *filp, struct inode *inode, int type, uint blk, cfs_list_t *list) @@ -1121,13 +1127,5 @@ out_free: RETURN(rc); } - - -EXPORT_SYMBOL(lustre_read_quota_info); -EXPORT_SYMBOL(lustre_write_quota_info); -EXPORT_SYMBOL(lustre_check_quota_file); -EXPORT_SYMBOL(lustre_read_dquot); -EXPORT_SYMBOL(lustre_commit_dquot); -EXPORT_SYMBOL(lustre_init_quota_info); EXPORT_SYMBOL(lustre_get_qids); #endif diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c index 7414471..2048c26 100644 --- a/lustre/lvfs/lvfs_linux.c +++ b/lustre/lvfs/lvfs_linux.c @@ -67,6 +67,7 @@ __u64 obd_max_pages = 0; __u64 obd_max_alloc = 0; struct lprocfs_stats *obd_memory = NULL; +EXPORT_SYMBOL(obd_memory); cfs_spinlock_t obd_updatemax_lock = CFS_SPIN_LOCK_UNLOCKED; /* refine later and change to seqlock or simlar from libcfs */ @@ -551,6 +552,7 @@ void obd_update_maxusage() cfs_spin_unlock(&obd_updatemax_lock); } +EXPORT_SYMBOL(obd_update_maxusage); __u64 obd_memory_max(void) { @@ -562,6 +564,7 @@ __u64 obd_memory_max(void) return ret; } +EXPORT_SYMBOL(obd_memory_max); __u64 obd_pages_max(void) { @@ -573,11 +576,7 @@ __u64 obd_pages_max(void) return ret; } - -EXPORT_SYMBOL(obd_update_maxusage); EXPORT_SYMBOL(obd_pages_max); -EXPORT_SYMBOL(obd_memory_max); -EXPORT_SYMBOL(obd_memory); #ifdef LPROCFS __s64 lprocfs_read_helper(struct lprocfs_counter *lc, -- 1.8.3.1