From c68c968e8a2f462a66f080494d9a743027767685 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 17 Sep 2012 16:46:34 +1000 Subject: [PATCH] --- yaml --- r: 333114 b: refs/heads/master c: 62d98c935456ee121b03d6a68aa3091a04085b7e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4namespace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c976b6185237..e87043ba5970 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8d920c58ddb45126e1b306854f6e34b88446baf +refs/heads/master: 62d98c935456ee121b03d6a68aa3091a04085b7e diff --git a/trunk/fs/nfs/nfs4namespace.c b/trunk/fs/nfs/nfs4namespace.c index 398d5fd74157..4fdeb1b7042e 100644 --- a/trunk/fs/nfs/nfs4namespace.c +++ b/trunk/fs/nfs/nfs4namespace.c @@ -198,7 +198,7 @@ struct rpc_clnt *nfs4_create_sec_client(struct rpc_clnt *clnt, struct inode *ino flavor = nfs4_negotiate_security(inode, name); if ((int)flavor < 0) - return ERR_PTR(flavor); + return ERR_PTR((int)flavor); clone = rpc_clone_client(clnt); if (IS_ERR(clone))