umount.nfs is treating nfs_call_umount's return code like a standard mount
return code (EX_SOMETHING) when its really an RPC return code.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
+/*
+ * nfs_call_umount - ask the server to remove a share from it's rmtab
+ * @mnt_server: address of RPC MNT program server
+ * @argp: directory path of share to "unmount"
+ *
+ * Returns one if the unmount call succeeded; zero if the unmount
+ * failed for any reason.
+ *
+ * Note that a side effect of calling this function is that rpccreateerr
+ * is set.
+ */
int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp)
{
CLIENT *clnt;
int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp)
{
CLIENT *clnt;
case 2:
case 1:
if (!probe_mntport(mnt_server))
case 2:
case 1:
if (!probe_mntport(mnt_server))
clnt = mnt_openclnt(mnt_server, &msock);
if (!clnt)
clnt = mnt_openclnt(mnt_server, &msock);
if (!clnt)
res = clnt_call(clnt, MOUNTPROC_UMNT,
res = clnt_call(clnt, MOUNTPROC_UMNT,
- (xdrproc_t) xdr_dirpath, (caddr_t)argp,
- (xdrproc_t) xdr_void, NULL,
+ (xdrproc_t)xdr_dirpath, (caddr_t)argp,
+ (xdrproc_t)xdr_void, NULL,
TIMEOUT);
mnt_closeclnt(clnt, msock);
if (res == RPC_SUCCESS)
return 1;
break;
default:
TIMEOUT);
mnt_closeclnt(clnt, msock);
if (res == RPC_SUCCESS)
return 1;
break;
default:
+
+ if (res == RPC_SUCCESS)
+ return 1;
+ return 0;