Commit 1e712473 authored by Ivan Bornyakov's avatar Ivan Bornyakov Committed by Greg Kroah-Hartman
Browse files

staging: lustre: libcfs: add parens around macros args 



One may call 'CFS_FAIL_TIMEOUT(id, secs + 5);' and get unexpected result
after macro substitution, viz., 'secs + 5' will turn into
'secs + 5 * 1000'

Signed-off-by: default avatarIvan Bornyakov <brnkv.i1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 777690e6

drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h

+3 −3
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static inline int cfs_fail_timeout_set(u32 id, u32 value, int ms, int set) 


/* If id hit cfs_fail_loc, sleep for seconds or milliseconds */

#define CFS_FAIL_TIMEOUT(id, secs) \

	cfs_fail_timeout_set(id, 0, secs * 1000, CFS_FAIL_LOC_NOSET)

	cfs_fail_timeout_set(id, 0, (secs) * 1000, CFS_FAIL_LOC_NOSET)



#define CFS_FAIL_TIMEOUT_MS(id, ms) \

	cfs_fail_timeout_set(id, 0, ms, CFS_FAIL_LOC_NOSET)
@@ -153,10 +153,10 @@ static inline int cfs_fail_timeout_set(u32 id, u32 value, int ms, int set) 
 * sleep seconds or milliseconds

 */

#define CFS_FAIL_TIMEOUT_ORSET(id, value, secs) \

	cfs_fail_timeout_set(id, value, secs * 1000, CFS_FAIL_LOC_ORSET)

	cfs_fail_timeout_set(id, value, (secs) * 1000, CFS_FAIL_LOC_ORSET)



#define CFS_FAIL_TIMEOUT_RESET(id, value, secs) \

	cfs_fail_timeout_set(id, value, secs * 1000, CFS_FAIL_LOC_RESET)

	cfs_fail_timeout_set(id, value, (secs) * 1000, CFS_FAIL_LOC_RESET)



#define CFS_FAIL_TIMEOUT_MS_ORSET(id, value, ms) \

	cfs_fail_timeout_set(id, value, ms, CFS_FAIL_LOC_ORSET)