aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4namespace.c4
-rw-r--r--fs/nfs/nfs4proc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index 017b4b01a69..4fdeb1b7042 100644
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -198,14 +198,14 @@ struct rpc_clnt *nfs4_create_sec_client(struct rpc_clnt *clnt, struct inode *ino
198 198
199 flavor = nfs4_negotiate_security(inode, name); 199 flavor = nfs4_negotiate_security(inode, name);
200 if ((int)flavor < 0) 200 if ((int)flavor < 0)
201 return ERR_PTR(flavor); 201 return ERR_PTR((int)flavor);
202 202
203 clone = rpc_clone_client(clnt); 203 clone = rpc_clone_client(clnt);
204 if (IS_ERR(clone)) 204 if (IS_ERR(clone))
205 return clone; 205 return clone;
206 206
207 auth = rpcauth_create(flavor, clone); 207 auth = rpcauth_create(flavor, clone);
208 if (!auth) { 208 if (IS_ERR(auth)) {
209 rpc_shutdown_client(clone); 209 rpc_shutdown_client(clone);
210 clone = ERR_PTR(-EIO); 210 clone = ERR_PTR(-EIO);
211 } 211 }
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 1e50326d00d..ddfebb12801 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2399,7 +2399,7 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl
2399 int ret; 2399 int ret;
2400 2400
2401 auth = rpcauth_create(flavor, server->client); 2401 auth = rpcauth_create(flavor, server->client);
2402 if (!auth) { 2402 if (IS_ERR(auth)) {
2403 ret = -EIO; 2403 ret = -EIO;
2404 goto out; 2404 goto out;
2405 } 2405 }