* [PATCH] cgroup: Fix misspelling of CONFIG_SOCK_CGROUP_DATA in comments
@ 2016-01-26 14:39 Andreas Ziegler
[not found] ` <1453819158-25380-1-git-send-email-andreas.ziegler-d40JDW7QUjc@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Ziegler @ 2016-01-26 14:39 UTC (permalink / raw)
To: Tejun Heo
Cc: Li Zefan, Johannes Weiner, cgroups, linux-kernel, Andreas Ziegler
Commit bd1060a1d671 ("sock, cgroup: add sock->sk_cgroup") added new
code guarded by an #ifdef CONFIG_SOCK_CGROUP_DATA to
include/linux/cgroup.h.
In the comments for the corresponding #else and #endifs, however,
the option is misspelled as CONFIG_CGROUP_DATA. Fix those comments.
Signed-off-by: Andreas Ziegler <andreas.ziegler@fau.de>
---
include/linux/cgroup.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 2162dca..48ce12f 100644
--- 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
}
-#else /* CONFIG_CGROUP_DATA */
+#else /* CONFIG_SOCK_CGROUP_DATA */
static inline void cgroup_sk_alloc(struct sock_cgroup_data *skcd) {}
static inline void cgroup_sk_free(struct sock_cgroup_data *skcd) {}
-#endif /* CONFIG_CGROUP_DATA */
+#endif /* CONFIG_SOCK_CGROUP_DATA */
#endif /* _LINUX_CGROUP_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread[parent not found: <1453819158-25380-1-git-send-email-andreas.ziegler-d40JDW7QUjc@public.gmane.org>]
* RE: [PATCH] cgroup: Fix misspelling of CONFIG_SOCK_CGROUP_DATA in comments 2016-01-26 14:39 [PATCH] cgroup: Fix misspelling of CONFIG_SOCK_CGROUP_DATA in comments Andreas Ziegler @ 2016-01-26 15:08 ` Rosen, Rami 0 siblings, 0 replies; 6+ messages in thread From: Rosen, Rami @ 2016-01-26 15:08 UTC (permalink / raw) To: Andreas Ziegler, Tejun Heo Cc: Li Zefan, Johannes Weiner, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rosen, Rami 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 */ Regards, Rami Rosen Intel Corporation ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] cgroup: Fix misspelling of CONFIG_SOCK_CGROUP_DATA in comments @ 2016-01-26 15:08 ` Rosen, Rami 0 siblings, 0 replies; 6+ messages in thread From: Rosen, Rami @ 2016-01-26 15:08 UTC (permalink / raw) To: Andreas Ziegler, Tejun Heo Cc: Li Zefan, Johannes Weiner, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Rosen, Rami 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 */ Regards, Rami Rosen Intel Corporation ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] cgroup: Fix misspelling of CONFIG_SOCK_CGROUP_DATA in comments 2016-01-26 15:08 ` Rosen, Rami (?) @ 2016-01-26 15:14 ` Andreas Ziegler [not found] ` <56A78D56.2030902-d40JDW7QUjc@public.gmane.org> -1 siblings, 1 reply; 6+ messages in thread From: Andreas Ziegler @ 2016-01-26 15:14 UTC (permalink / raw) To: Rosen, Rami, Tejun Heo Cc: Li Zefan, Johannes Weiner, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org On 01/26/2016 16:08, Rosen, Rami wrote: > 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 I don't mind changing it, I'm just not sure if that's what we want. Regards, Andreas ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <56A78D56.2030902-d40JDW7QUjc@public.gmane.org>]
* Re: [PATCH] cgroup: Fix misspelling of CONFIG_SOCK_CGROUP_DATA in comments 2016-01-26 15:14 ` Andreas Ziegler @ 2016-01-26 15:34 ` Johannes Weiner 0 siblings, 0 replies; 6+ messages in thread From: Johannes Weiner @ 2016-01-26 15:34 UTC (permalink / raw) To: Andreas Ziegler Cc: Rosen, Rami, Tejun Heo, Li Zefan, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org On Tue, Jan 26, 2016 at 04:14:30PM +0100, Andreas Ziegler wrote: > On 01/26/2016 16:08, Rosen, Rami wrote: > > 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! ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] cgroup: Fix misspelling of CONFIG_SOCK_CGROUP_DATA in comments @ 2016-01-26 15:34 ` Johannes Weiner 0 siblings, 0 replies; 6+ messages in thread From: Johannes Weiner @ 2016-01-26 15:34 UTC (permalink / raw) To: Andreas Ziegler Cc: Rosen, Rami, Tejun Heo, Li Zefan, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org On Tue, Jan 26, 2016 at 04:14:30PM +0100, Andreas Ziegler wrote: > On 01/26/2016 16:08, Rosen, Rami wrote: > > 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! ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-01-26 15:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-26 14:39 [PATCH] cgroup: Fix misspelling of CONFIG_SOCK_CGROUP_DATA in comments Andreas Ziegler
[not found] ` <1453819158-25380-1-git-send-email-andreas.ziegler-d40JDW7QUjc@public.gmane.org>
2016-01-26 15:08 ` Rosen, Rami
2016-01-26 15:08 ` Rosen, Rami
2016-01-26 15:14 ` Andreas Ziegler
[not found] ` <56A78D56.2030902-d40JDW7QUjc@public.gmane.org>
2016-01-26 15:34 ` Johannes Weiner
2016-01-26 15:34 ` Johannes Weiner
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.