Attachment 949864 Details for Bug 1155584 – Proposed fix

[patch] Proposed fix

0001-Skip-NFS-mounts-without-rquotad-RPC-service-silently.patch (text/plain), 2.07 KB, created by Petr Pisar on 2014-10-23 12:45:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Pisar

Created: 2014-10-23 12:45:07 UTC

Size: 2.07 KB

patch

obsolete

>From 79c10494b22871b51c1edc027b59e106e6d75459 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
>Date: Thu, 23 Oct 2014 14:12:01 +0200
>Subject: [PATCH] Skip NFS mounts without rquotad RPC service silently
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>If NFS server does uses quotas, then it's high chance the RCP rquotad
>service is not running at all. Then listing quotas for such NFS mount
>point results into a warning about "connection refused".
>
>This warning can be obtrusive if a host has mounted various mixture of
>NFS exports with and without quotas.
>
>This patch recognizes this special error state (after performing
>a query to a client without running rquotad) and considers such
>server as having quotas disabled. This silents the warning
>effectively.
>
>Signed-off-by: Petr PÃsaÅ <ppisar@redhat.com>
>---
> rquota_client.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/rquota_client.c b/rquota_client.c
>index 9d4055e..1aaf1dc 100644
>--- a/rquota_client.c
>+++ b/rquota_client.c
>@@ -148,6 +148,7 @@ int rpc_rquota_get(struct dquot *dquot)
> 	} args;
> 	char *fsname_tmp, *host, *pathname;
> 	struct timeval timeout = { 2, 0 };
>+	int rquotaprog_not_registered = 0;
> 
> 	/*
> 	 * Initialize with NULL.
>@@ -206,8 +207,12 @@ int rpc_rquota_get(struct dquot *dquot)
> 		auth_destroy(clnt->cl_auth);
> 		clnt_destroy(clnt);
> 	}
>-	else
>+	else {
> 		result = NULL;
>+		if (rpc_createerr.cf_stat == RPC_PROGNOTREGISTERED) {
>+		        rquotaprog_not_registered = 1;
>+		}
>+	}
> 
> 	if (result == NULL || !result->status) {
> 		if (dquot->dq_h->qh_type == USRQUOTA) {
>@@ -244,11 +249,16 @@ int rpc_rquota_get(struct dquot *dquot)
> 				 */
> 				auth_destroy(clnt->cl_auth);
> 				clnt_destroy(clnt);
>+			} else {
>+				if (rpc_createerr.cf_stat == RPC_PROGNOTREGISTERED) {
>+					    rquotaprog_not_registered = 1;
>+				}
> 			}
> 		}
> 	}
> 	free(fsname_tmp);
>-	return rquota_err(result?result->status:-1);
>+	return rquota_err(result?result->status:
>+            rquotaprog_not_registered?Q_NOQUOTA:-1);
> }
> 
> /*
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1155584: 949864 | 961550