diff options
| author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
| commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
| tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /fs/coda/upcall.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/coda/upcall.c')
| -rw-r--r-- | fs/coda/upcall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c index ce432bca95d1..c274d949179d 100644 --- a/fs/coda/upcall.c +++ b/fs/coda/upcall.c | |||
| @@ -52,7 +52,7 @@ static void *alloc_upcall(int opcode, int size) | |||
| 52 | inp->ih.opcode = opcode; | 52 | inp->ih.opcode = opcode; |
| 53 | inp->ih.pid = current->pid; | 53 | inp->ih.pid = current->pid; |
| 54 | inp->ih.pgid = task_pgrp_nr(current); | 54 | inp->ih.pgid = task_pgrp_nr(current); |
| 55 | inp->ih.uid = current->fsuid; | 55 | inp->ih.uid = current_fsuid(); |
| 56 | 56 | ||
| 57 | return (void*)inp; | 57 | return (void*)inp; |
| 58 | } | 58 | } |