From 8d36bf81dcc19a5bcd94472695b0fd5b6ceab19f Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue, 17 Nov 2009 14:06:24 -0800
Subject: [PATCH] --- yaml --- r: 168707 b: refs/heads/master c:
 978b4053aefd422713f289f2a315ce2acba62018 h: refs/heads/master i:   168705:
 d5196996eb3f21f592bfb9d33be59adbb03b0d35   168703:
 98fbea8ea5fda3786d867c9b576312c10fa85094 v: v3

---
 [refs]                            | 2 +-
 trunk/fs/fcntl.c                  | 4 ++--
 trunk/include/asm-generic/fcntl.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e7c4775bd6c1..bdbfba9ba2bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ebd4eba761b624a6a6c9189335adeddcb1fa0e0
+refs/heads/master: 978b4053aefd422713f289f2a315ce2acba62018
diff --git a/trunk/fs/fcntl.c b/trunk/fs/fcntl.c
index fc089f2f7f56..2cf93ec40a67 100644
--- a/trunk/fs/fcntl.c
+++ b/trunk/fs/fcntl.c
@@ -284,7 +284,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
 		type = PIDTYPE_PID;
 		break;
 
-	case F_OWNER_GID:
+	case F_OWNER_PGRP:
 		type = PIDTYPE_PGID;
 		break;
 
@@ -321,7 +321,7 @@ static int f_getown_ex(struct file *filp, unsigned long arg)
 		break;
 
 	case PIDTYPE_PGID:
-		owner.type = F_OWNER_GID;
+		owner.type = F_OWNER_PGRP;
 		break;
 
 	default:
diff --git a/trunk/include/asm-generic/fcntl.h b/trunk/include/asm-generic/fcntl.h
index cd2d7896e34b..495dc8af4044 100644
--- a/trunk/include/asm-generic/fcntl.h
+++ b/trunk/include/asm-generic/fcntl.h
@@ -89,7 +89,7 @@
 
 #define F_OWNER_TID	0
 #define F_OWNER_PID	1
-#define F_OWNER_GID	2
+#define F_OWNER_PGRP	2
 
 struct f_owner_ex {
 	int	type;