diff options
author | Weston Andros Adamson <dros@netapp.com> | 2012-10-23 10:43:25 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-11-04 14:43:40 -0500 |
commit | 922eeac30d8456b8e4462cfb94ddbb6846790ad4 (patch) | |
tree | 265108c17809e70bcb498f2d419583c1e76d2487 /net | |
parent | 262693482cd56f887174ad1c0c2bb4f94ffad0ee (diff) |
SUNRPC: remove BUG_ON in __rpc_clnt_handle_event
Print a KERN_INFO message before rpc_d_lookup_sb returns NULL, like
other error paths in that function.
Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/sunrpc/clnt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index dd2532c10324..245de1a208f4 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -132,8 +132,10 @@ static struct dentry *rpc_setup_pipedir_sb(struct super_block *sb, | |||
132 | int error; | 132 | int error; |
133 | 133 | ||
134 | dir = rpc_d_lookup_sb(sb, dir_name); | 134 | dir = rpc_d_lookup_sb(sb, dir_name); |
135 | if (dir == NULL) | 135 | if (dir == NULL) { |
136 | pr_info("RPC: pipefs directory doesn't exist: %s\n", dir_name); | ||
136 | return dir; | 137 | return dir; |
138 | } | ||
137 | for (;;) { | 139 | for (;;) { |
138 | q.len = snprintf(name, sizeof(name), "clnt%x", (unsigned int)clntid++); | 140 | q.len = snprintf(name, sizeof(name), "clnt%x", (unsigned int)clntid++); |
139 | name[sizeof(name) - 1] = '\0'; | 141 | name[sizeof(name) - 1] = '\0'; |
@@ -192,7 +194,8 @@ static int __rpc_clnt_handle_event(struct rpc_clnt *clnt, unsigned long event, | |||
192 | case RPC_PIPEFS_MOUNT: | 194 | case RPC_PIPEFS_MOUNT: |
193 | dentry = rpc_setup_pipedir_sb(sb, clnt, | 195 | dentry = rpc_setup_pipedir_sb(sb, clnt, |
194 | clnt->cl_program->pipe_dir_name); | 196 | clnt->cl_program->pipe_dir_name); |
195 | BUG_ON(dentry == NULL); | 197 | if (!dentry) |
198 | return -ENOENT; | ||
196 | if (IS_ERR(dentry)) | 199 | if (IS_ERR(dentry)) |
197 | return PTR_ERR(dentry); | 200 | return PTR_ERR(dentry); |
198 | clnt->cl_dentry = dentry; | 201 | clnt->cl_dentry = dentry; |