On Tue, Jan 26, 2016 at 04:14:30PM +0100, Andreas Ziegler wrote:

On 01/26/2016 16:08, Rosen, Rami wrote:

quoted

Hi, 

--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h

@@ -604,11 +604,11 @@ static inline struct cgroup *sock_cgroup_ptr(struct sock_cgroup_data *skcd)
 #endif
 }

In this occasion, seems that maybe something else is also missing:
Shouldn't it be hereafter : +#else /* !CONFIG_SOCK_CGROUP_DATA */ 
instead ? 
   
-#else	/* CONFIG_CGROUP_DATA */
+#else	/* CONFIG_SOCK_CGROUP_DATA */

It seems that there is no real consensus among the developers for that
particular case:

ziegler@box:~/linux$ git grep "#else \/\* \!CONFIG_" | wc -l
327
ziegler@box:~/linux$ git grep "#else \/\* CONFIG_" | wc -l
564

The comments after #ifdef, #ifndef, #else, #endif name the condition
that is being branched on, not the condition that is in effect after
a specific line. Case in point: #endif /* CONFIG_SOCK_CGROUP_DATA */

Stick with the majority, and save a byte!