From: Mike Marshall Date: Tue, 19 Jan 2016 17:04:40 +0000 (-0500) Subject: Orangefs: make gossip statement more palatable to xtensa X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cf0c27715bd640628d39421f3d232c87d7e08954;p=linux-beck.git Orangefs: make gossip statement more palatable to xtensa Thanks to Intel's kbuild test robot Signed-off-by: Mike Marshall --- diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c index 0f01d3edfc2b..5da5ef616b85 100644 --- a/fs/orangefs/devorangefs-req.c +++ b/fs/orangefs/devorangefs-req.c @@ -275,10 +275,10 @@ static ssize_t orangefs_devreq_write_iter(struct kiocb *iocb, ret); if (total < MAX_DEV_REQ_DOWNSIZE) { - gossip_err("%s: total:%d: must be at least:%lu:\n", + gossip_err("%s: total:%d: must be at least:%u:\n", __func__, total, - MAX_DEV_REQ_DOWNSIZE); + (unsigned int) MAX_DEV_REQ_DOWNSIZE); ret = -EFAULT; goto out; } diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h index 1c87e0bbdfe8..6dcc38a5f117 100644 --- a/fs/orangefs/orangefs-kernel.h +++ b/fs/orangefs/orangefs-kernel.h @@ -75,9 +75,9 @@ #define ORANGEFS_MAX_MOUNT_OPT_LEN 0x00000080 #define ORANGEFS_MAX_FSKEY_LEN 64 -#define MAX_DEV_REQ_UPSIZE (2*sizeof(__s32) + \ +#define MAX_DEV_REQ_UPSIZE (2 * sizeof(__s32) + \ sizeof(__u64) + sizeof(struct orangefs_upcall_s)) -#define MAX_DEV_REQ_DOWNSIZE (2*sizeof(__s32) + \ +#define MAX_DEV_REQ_DOWNSIZE (2 * sizeof(__s32) + \ sizeof(__u64) + sizeof(struct orangefs_downcall_s)) /* borrowed from irda.h */