From: Jian Yu Date: Thu, 27 Mar 2014 09:57:18 +0000 (+0800) Subject: LU-4669 ldiskfs: do not export static inline functions X-Git-Tag: 2.5.58~1 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e387b0e21c093ebbfb7571cd9e65a98d8e7e5718 LU-4669 ldiskfs: do not export static inline functions In ldiskfs/ldiskfs_extents.h, both ldiskfs_ext_store_pblock() and ldiskfs_ext_pblock() are defined as static inline functions. However, commit 49b06fba39e (http://review.whamcloud.com/4804) exported these two functions in ldiskfs/extents.c, which is not allowed by gcc and causes the following compile errors: error: __ksymtab_ldiskfs_ext_pblock causes a section type conflict error: __ksymtab_ldiskfs_ext_store_pblock causes a section type conflict This patch fixes the above errors by not exporting the two functions. Signed-off-by: Jian Yu Change-Id: I8969f95f144a59d5ae8033667136abd958dfe2ab Reviewed-on: http://review.whamcloud.com/9401 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: John L. Hammond Reviewed-by: Andreas Dilger --- diff --git a/ldiskfs/kernel_patches/patches/rhel6.4/ext4-misc.patch b/ldiskfs/kernel_patches/patches/rhel6.4/ext4-misc.patch index 8c0f482..24b7128 100644 --- a/ldiskfs/kernel_patches/patches/rhel6.4/ext4-misc.patch +++ b/ldiskfs/kernel_patches/patches/rhel6.4/ext4-misc.patch @@ -138,14 +138,12 @@ Index: linux-stage/fs/ext4/extents.c * How many index/leaf blocks need to change/allocate to modify nrblocks? * * if nrblocks are fit in a single extent (chunk flag is 1), then -@@ -4488,3 +4537,14 @@ int ext4_fiemap(struct inode *inode, str +@@ -4488,3 +4537,12 @@ int ext4_fiemap(struct inode *inode, str return error; } -+EXPORT_SYMBOL(ext4_ext_store_pblock); +EXPORT_SYMBOL(ext4_ext_search_right); +EXPORT_SYMBOL(ext4_ext_search_left); -+EXPORT_SYMBOL(ext4_ext_pblock); +EXPORT_SYMBOL(ext4_ext_insert_extent); +EXPORT_SYMBOL(ext4_mb_new_blocks); +EXPORT_SYMBOL(ext4_ext_calc_credits_for_insert);