From cf2d5dc0e850090c4cf646d584f9bb4c17487ebe Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 13 Dec 2017 14:15:55 +1100 Subject: [PATCH] staging: lustre: libcfs: remove unused rounding functions. These are all unused except cfs_size_round(). So discard the others, and use the kernel-standard round_up() function to implement cfs_size_round(). Signed-off-by: NeilBrown Signed-off-by: Greg Kroah-Hartman --- .../include/linux/libcfs/libcfs_private.h | 29 +------------------ 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h index c874f9d15c72..dee5f650197f 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h @@ -243,40 +243,13 @@ do { \ #define MKSTR(ptr) ((ptr)) ? (ptr) : "" -static inline size_t cfs_size_round4(int val) -{ - return (val + 3) & (~0x3); -} - #ifndef HAVE_CFS_SIZE_ROUND static inline size_t cfs_size_round(int val) { - return (val + 7) & (~0x7); + return round_up(val, 8); } #define HAVE_CFS_SIZE_ROUND #endif -static inline size_t cfs_size_round16(int val) -{ - return (val + 0xf) & (~0xf); -} - -static inline size_t cfs_size_round32(int val) -{ - return (val + 0x1f) & (~0x1f); -} - -static inline size_t cfs_size_round0(int val) -{ - if (!val) - return 0; - return (val + 1 + 7) & (~0x7); -} - -static inline size_t cfs_round_strlen(char *fset) -{ - return cfs_size_round((int)strlen(fset) + 1); -} - #endif -- 2.45.2