Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0dba7c2a9ed3d4a1e58f5d94fffa9f44dbe012e6

Authored by Chuck Lever
Committed by J. Bruce Fields
1 parent d3fe5ea7cf
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

NLM: Clean up flow of control in make_socks() function 

Clean up: Use Bruce's preferred control flow style in make_socks().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

Showing 1 changed file with 14 additions and 8 deletions Side-by-side Diff

... ... @@ -230,17 +230,23 @@
230 230 static int make_socks(struct svc_serv *serv)
231 231 {
232 232 static int warned;
233   - int err = 0;
  233 + int err;
234 234  
235 235 err = create_lockd_listener(serv, "udp", nlm_udpport);
236   - if (err >= 0)
237   - err = create_lockd_listener(serv, "tcp", nlm_tcpport);
238   - if (err >= 0) {
239   - warned = 0;
240   - err = 0;
241   - } else if (warned++ == 0)
  236 + if (err < 0)
  237 + goto out_err;
  238 +
  239 + err = create_lockd_listener(serv, "tcp", nlm_tcpport);
  240 + if (err < 0)
  241 + goto out_err;
  242 +
  243 + warned = 0;
  244 + return 0;
  245 +
  246 +out_err:
  247 + if (warned++ == 0)
242 248 printk(KERN_WARNING
243   - "lockd_up: makesock failed, error=%d\n", err);
  249 + "lockd_up: makesock failed, error=%d\n", err);
244 250 return err;
245 251 }
246 252