[lkml]   [2013]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the userns tree with the nfsd tree
Hi Eric,

Today's linux-next merge of the userns tree got a conflict in
net/sunrpc/svcauth_unix.c between commit 2d4383383b0b ("SUNRPC: rework
cache upcall logic") from the nfsd tree and commit 7eaf040b720b ("sunrpc:
Use kuid_t and kgid_t where appropriate") from the userns tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell

diff --cc net/sunrpc/svcauth_unix.c
index 5085804,a1852e1..0000000
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@@ -465,7 -475,12 +470,7 @@@ static void unix_gid_request(struct cac
(*bpp)[-1] = '\n';

- static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, uid_t uid);
-static int unix_gid_upcall(struct cache_detail *cd, struct cache_head *h)
- return sunrpc_cache_pipe_upcall(cd, h, unix_gid_request);
+ static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid);

static int unix_gid_parse(struct cache_detail *cd,
char *mesg, int mlen)
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2013-02-18 07:01    [W:0.033 / U:0.408 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site