Quoting Serge Hallyn (serge@xxxxxxxxxx):
> From: Serge E. Hallyn <serge.hallyn@xxxxxxxxxxxxx>
>
> The uid/gid comparisons don't have to be pulled out. This just seemed
> more easily proved correct.
The following needs to be folded into this patch:
From: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx>
Date: Thu, 4 Aug 2011 21:48:13 +0000
Subject: [PATCH 2/2] fold up - net/core/scm.c: cred is const
Signed-off-by: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx>
---
net/core/scm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/core/scm.c b/net/core/scm.c
index 21b5d0b..528fa36 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -43,7 +43,7 @@
* setu(g)id.
*/
-static __inline__ bool uidequiv(struct cred *src, struct ucred *tgt,
+static __inline__ bool uidequiv(const struct cred *src, struct ucred *tgt,
struct user_namespace *ns)
{
if (src->user_ns != ns)
@@ -57,7 +57,7 @@ check_capable:
return false;
}
-static __inline__ bool gidequiv(struct cred *src, struct ucred *tgt,
+static __inline__ bool gidequiv(const struct cred *src, struct ucred *tgt,
struct user_namespace *ns)
{
if (src->user_ns != ns)
--
1.7.5.4
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/containers
