From: Linus Torvalds Date: Sat, 12 Apr 2014 22:39:53 +0000 (-0700) Subject: ceph: fix pr_fmt() redefinition X-Git-Tag: firefly_0821_release~176^2~4069 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=96c57ade7e9ba2d1deba635a5989cc111f185dca;p=firefly-linux-kernel-4.4.55.git ceph: fix pr_fmt() redefinition The vfs merge caused a latent bug to show up: In file included from fs/ceph/super.h:4:0, from fs/ceph/ioctl.c:3: include/linux/ceph/ceph_debug.h:4:0: warning: "pr_fmt" redefined [enabled by default] #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt ^ In file included from include/linux/kernel.h:13:0, from include/linux/uio.h:12, from include/linux/socket.h:7, from include/uapi/linux/in.h:22, from include/linux/in.h:23, from fs/ceph/ioctl.c:1: include/linux/printk.h:214:0: note: this is the location of the previous definition #define pr_fmt(fmt) fmt ^ where the reason is that is included much too late for the "pr_fmt()" define. The include of needs to be the first include in the file, but fs/ceph/ioctl.c had for some reason missed that, and it wasn't noticeable until some unrelated header file changes brought in an indirect earlier include of . Signed-off-by: Linus Torvalds --- diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c index efbe08289292..fdf941b44ff1 100644 --- a/fs/ceph/ioctl.c +++ b/fs/ceph/ioctl.c @@ -1,9 +1,8 @@ +#include #include #include "super.h" #include "mds_client.h" -#include - #include "ioctl.h"