From 73b5289263fd54522cc863ece01d998195d733d7 Mon Sep 17 00:00:00 2001 From: Weston Andros Adamson Date: Tue, 23 Oct 2012 10:43:25 -0400 Subject: [PATCH] --- yaml --- r: 346547 b: refs/heads/master c: 922eeac30d8456b8e4462cfb94ddbb6846790ad4 h: refs/heads/master i: 346545: c355b9ba3be524c2e24f31d1528d9bbe55945501 346543: 97e044248a0cb635aa42bd0e21af45fe651bde49 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/clnt.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5aaf78089172..1ea2831238d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 262693482cd56f887174ad1c0c2bb4f94ffad0ee +refs/heads/master: 922eeac30d8456b8e4462cfb94ddbb6846790ad4 diff --git a/trunk/net/sunrpc/clnt.c b/trunk/net/sunrpc/clnt.c index dd2532c10324..245de1a208f4 100644 --- a/trunk/net/sunrpc/clnt.c +++ b/trunk/net/sunrpc/clnt.c @@ -132,8 +132,10 @@ static struct dentry *rpc_setup_pipedir_sb(struct super_block *sb, int error; dir = rpc_d_lookup_sb(sb, dir_name); - if (dir == NULL) + if (dir == NULL) { + pr_info("RPC: pipefs directory doesn't exist: %s\n", dir_name); return dir; + } for (;;) { q.len = snprintf(name, sizeof(name), "clnt%x", (unsigned int)clntid++); name[sizeof(name) - 1] = '\0'; @@ -192,7 +194,8 @@ static int __rpc_clnt_handle_event(struct rpc_clnt *clnt, unsigned long event, case RPC_PIPEFS_MOUNT: dentry = rpc_setup_pipedir_sb(sb, clnt, clnt->cl_program->pipe_dir_name); - BUG_ON(dentry == NULL); + if (!dentry) + return -ENOENT; if (IS_ERR(dentry)) return PTR_ERR(dentry); clnt->cl_dentry = dentry;