Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 363f724cdd3d2ae554e261be995abdeb15f7bdd9

Authored by Chuck Lever
Committed by Trond Myklebust
1 parent cadc0fa534
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, 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, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

SUNRPC: rpcb_register() should handle errors silently 

Move error reporting for RPC registration to rpcb_register's caller.

This way the caller can choose to recover silently from certain
errors, but report errors it does not recognize.  Error reporting
for kernel RPC service registration is now handled in one place.

This patch is part of a series that addresses
   http://bugzilla.kernel.org/show_bug.cgi?id=12256

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

Showing 2 changed files with 12 additions and 8 deletions Side-by-side Diff

net/sunrpc/rpcb_clnt.c
Diff comments   View file @ 363f724
... ... @@ -194,7 +194,7 @@
194 194 error = PTR_ERR(rpcb_clnt);
195 195  
196 196 if (error < 0) {
197   - printk(KERN_WARNING "RPC: failed to contact local rpcbind "
  197 + dprintk("RPC: failed to contact local rpcbind "
198 198 "server (errno %d).\n", -error);
199 199 return error;
200 200 }
... ... @@ -818,26 +818,30 @@
818 818 * Returns zero on success; a negative errno value is returned
819 819 * if any error occurs.
820 820 */
821   -static int __svc_register(const u32 program, const u32 version,
  821 +static int __svc_register(const char *progname,
  822 + const u32 program, const u32 version,
822 823 const int family,
823 824 const unsigned short protocol,
824 825 const unsigned short port)
825 826 {
826   - int error;
  827 + int error = -EAFNOSUPPORT;
827 828  
828 829 switch (family) {
829 830 case PF_INET:
830   - return __svc_rpcb_register4(program, version,
  831 + error = __svc_rpcb_register4(program, version,
831 832 protocol, port);
832 833 break;
833 834 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
834 835 case PF_INET6:
835   - return__svc_rpcb_register6(program, version,
  836 + error = __svc_rpcb_register6(program, version,
836 837 protocol, port);
837 838 #endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */
838 839 }
839 840  
840   - return -EAFNOSUPPORT;
  841 + if (error < 0)
  842 + printk(KERN_WARNING "svc: failed to register %sv%u RPC "
  843 + "service (errno %d).\n", progname, version, -error);
  844 + return error;
841 845 }
842 846  
843 847 /**
... ... @@ -875,8 +879,8 @@
875 879 if (progp->pg_vers[i]->vs_hidden)
876 880 continue;
877 881  
878   - error = __svc_register(progp->pg_prog, i,
879   - family, proto, port);
  882 + error = __svc_register(progp->pg_name, progp->pg_prog,
  883 + i, family, proto, port);
880 884 if (error < 0)
881 885 break;
882 886 }