diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /fs/fcntl.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'fs/fcntl.c')
| -rw-r--r-- | fs/fcntl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index fc089f2f7f56..2cf93ec40a67 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
| @@ -284,7 +284,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg) | |||
| 284 | type = PIDTYPE_PID; | 284 | type = PIDTYPE_PID; |
| 285 | break; | 285 | break; |
| 286 | 286 | ||
| 287 | case F_OWNER_GID: | 287 | case F_OWNER_PGRP: |
| 288 | type = PIDTYPE_PGID; | 288 | type = PIDTYPE_PGID; |
| 289 | break; | 289 | break; |
| 290 | 290 | ||
| @@ -321,7 +321,7 @@ static int f_getown_ex(struct file *filp, unsigned long arg) | |||
| 321 | break; | 321 | break; |
| 322 | 322 | ||
| 323 | case PIDTYPE_PGID: | 323 | case PIDTYPE_PGID: |
| 324 | owner.type = F_OWNER_GID; | 324 | owner.type = F_OWNER_PGRP; |
| 325 | break; | 325 | break; |
| 326 | 326 | ||
| 327 | default: | 327 | default: |