All of lore.kernel.org
 help / color / mirror / Atom feed
From: Zhao Hongjiang <zhaohongjiang37-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org
Cc: containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
Subject: [PATCH] user_ns: compile bug fix in quota.h
Date: Thu, 06 Sep 2012 14:55:40 +0800	[thread overview]
Message-ID: <504848EC.3010904@gmail.com> (raw)

From: Zhao Hongjiang <zhaohongjiang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>

Failed to build userns-always-map-user-v53 from Eric's latest
user_ns branch with GCC 4.4.4 compiler due to violation of
C89 standard.

Signed-off-by: Zhao Hongjiang <zhaohongjiang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
 include/linux/quota.h |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/linux/quota.h b/include/linux/quota.h
index 781ffc4..90f12d7 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -280,9 +280,10 @@ static inline struct kqid make_kqid_invalid(enum quota_type type)
 static inline struct kqid make_kqid_uid(kuid_t uid)
 {
 	struct kqid kqid = {
-		.type = USRQUOTA,
-		.uid  = uid,
+		.type = USRQUOTA
 	};
+	kqid.uid = uid;
+
 	return kqid;
 }

@@ -293,9 +294,10 @@ static inline struct kqid make_kqid_uid(kuid_t uid)
 static inline struct kqid make_kqid_gid(kgid_t gid)
 {
 	struct kqid kqid = {
-		.type = GRPQUOTA,
-		.gid  = gid,
+		.type = GRPQUOTA
 	};
+	kqid.gid  = gid;
+
 	return kqid;
 }

@@ -306,9 +308,10 @@ static inline struct kqid make_kqid_gid(kgid_t gid)
 static inline struct kqid make_kqid_projid(kprojid_t projid)
 {
 	struct kqid kqid = {
-		.type = PRJQUOTA,
-		.projid = projid,
+		.type = PRJQUOTA
 	};
+	kqid.projid = projid;
+
 	return kqid;
 }

-- 1.7.1

             reply	other threads:[~2012-09-06  6:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-06  6:55 Zhao Hongjiang [this message]
     [not found] ` <504848EC.3010904-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-09-07  2:00   ` [PATCH] user_ns: compile bug fix in quota.h Eric W. Biederman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=504848EC.3010904@gmail.com \
    --to=zhaohongjiang37-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.