All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] exportfs: drop extra newline in xlog
@ 2011-09-01 15:16 Mike Frysinger
  2011-09-01 15:16 ` [PATCH 2/2] exportfs: do not warn if /etc/exports.d/ does not exist Mike Frysinger
  2011-09-01 15:35 ` [PATCH 1/2] exportfs: drop extra newline in xlog Steve Dickson
  0 siblings, 2 replies; 6+ messages in thread
From: Mike Frysinger @ 2011-09-01 15:16 UTC (permalink / raw)
  To: linux-nfs

Since xlog() itself appends a newline, we don't want to add our own
otherwise we get extra in the output.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 utils/exportfs/exportfs.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 12e8bf1..986a272 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -401,7 +401,7 @@ validate_export(nfs_export *exp)
 	int fs_has_fsid = 0;
 
 	if (stat(path, &stb) < 0) {
-		xlog(L_ERROR, "Failed to stat %s: %m \n", path);
+		xlog(L_ERROR, "Failed to stat %s: %m", path);
 		return;
 	}
 	if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) {
@@ -530,7 +530,7 @@ export_d_read(const char *dname)
 
 	n = scandir(dname, &namelist, NULL, versionsort);
 	if (n < 0)
-		xlog(L_NOTICE, "scandir %s: %s\n", dname, strerror(errno));
+		xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
 	else if (n == 0)
 		return;
 
@@ -558,7 +558,7 @@ export_d_read(const char *dname)
 
 		fname_len = snprintf(fname, PATH_MAX +1, "%s/%s", dname, d->d_name);
 		if (fname_len > PATH_MAX) {
-			xlog(L_WARNING, "Too long file name: %s in %s\n", d->d_name, dname);
+			xlog(L_WARNING, "Too long file name: %s in %s", d->d_name, dname);
 			continue;
 		}
 
@@ -672,7 +672,7 @@ dump(int verbose)
 static void
 error(nfs_export *exp, int err)
 {
-	xlog(L_ERROR, "%s:%s: %s\n", exp->m_client->m_hostname,
+	xlog(L_ERROR, "%s:%s: %s", exp->m_client->m_hostname,
 		exp->m_export.e_path, strerror(err));
 }
 
-- 
1.7.6


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/2] exportfs: do not warn if /etc/exports.d/ does not exist
  2011-09-01 15:16 [PATCH 1/2] exportfs: drop extra newline in xlog Mike Frysinger
@ 2011-09-01 15:16 ` Mike Frysinger
  2011-09-01 15:35   ` Steve Dickson
  2011-09-01 15:35 ` [PATCH 1/2] exportfs: drop extra newline in xlog Steve Dickson
  1 sibling, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2011-09-01 15:16 UTC (permalink / raw)
  To: linux-nfs

It isn't uncommon for /etc/exports.d/ to not exist, and imo, it's not
that big of a deal as often times, a simple /etc/exports is sufficient.
So silently skip the case where the dir is missing.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 utils/exportfs/exportfs.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 986a272..7432a65 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -529,9 +529,12 @@ export_d_read(const char *dname)
 
 
 	n = scandir(dname, &namelist, NULL, versionsort);
-	if (n < 0)
+	if (n < 0) {
+		if (errno == ENOENT)
+			/* Silently return */
+			return;
 		xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
-	else if (n == 0)
+	} else if (n == 0)
 		return;
 
 	for (i = 0; i < n; i++) {
-- 
1.7.6


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] exportfs: drop extra newline in xlog
  2011-09-01 15:16 [PATCH 1/2] exportfs: drop extra newline in xlog Mike Frysinger
  2011-09-01 15:16 ` [PATCH 2/2] exportfs: do not warn if /etc/exports.d/ does not exist Mike Frysinger
@ 2011-09-01 15:35 ` Steve Dickson
  1 sibling, 0 replies; 6+ messages in thread
From: Steve Dickson @ 2011-09-01 15:35 UTC (permalink / raw)
  To: Mike Frysinger; +Cc: linux-nfs



On 09/01/2011 11:16 AM, Mike Frysinger wrote:
> Since xlog() itself appends a newline, we don't want to add our own
> otherwise we get extra in the output.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Committed...

steved.

> ---
>  utils/exportfs/exportfs.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
> index 12e8bf1..986a272 100644
> --- a/utils/exportfs/exportfs.c
> +++ b/utils/exportfs/exportfs.c
> @@ -401,7 +401,7 @@ validate_export(nfs_export *exp)
>  	int fs_has_fsid = 0;
>  
>  	if (stat(path, &stb) < 0) {
> -		xlog(L_ERROR, "Failed to stat %s: %m \n", path);
> +		xlog(L_ERROR, "Failed to stat %s: %m", path);
>  		return;
>  	}
>  	if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) {
> @@ -530,7 +530,7 @@ export_d_read(const char *dname)
>  
>  	n = scandir(dname, &namelist, NULL, versionsort);
>  	if (n < 0)
> -		xlog(L_NOTICE, "scandir %s: %s\n", dname, strerror(errno));
> +		xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
>  	else if (n == 0)
>  		return;
>  
> @@ -558,7 +558,7 @@ export_d_read(const char *dname)
>  
>  		fname_len = snprintf(fname, PATH_MAX +1, "%s/%s", dname, d->d_name);
>  		if (fname_len > PATH_MAX) {
> -			xlog(L_WARNING, "Too long file name: %s in %s\n", d->d_name, dname);
> +			xlog(L_WARNING, "Too long file name: %s in %s", d->d_name, dname);
>  			continue;
>  		}
>  
> @@ -672,7 +672,7 @@ dump(int verbose)
>  static void
>  error(nfs_export *exp, int err)
>  {
> -	xlog(L_ERROR, "%s:%s: %s\n", exp->m_client->m_hostname,
> +	xlog(L_ERROR, "%s:%s: %s", exp->m_client->m_hostname,
>  		exp->m_export.e_path, strerror(err));
>  }
>  

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] exportfs: do not warn if /etc/exports.d/ does not exist
  2011-09-01 15:16 ` [PATCH 2/2] exportfs: do not warn if /etc/exports.d/ does not exist Mike Frysinger
@ 2011-09-01 15:35   ` Steve Dickson
  2011-09-02  0:40     ` Masatake YAMATO
  0 siblings, 1 reply; 6+ messages in thread
From: Steve Dickson @ 2011-09-01 15:35 UTC (permalink / raw)
  To: Mike Frysinger; +Cc: linux-nfs



On 09/01/2011 11:16 AM, Mike Frysinger wrote:
> It isn't uncommon for /etc/exports.d/ to not exist, and imo, it's not
> that big of a deal as often times, a simple /etc/exports is sufficient.
> So silently skip the case where the dir is missing.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Committed...

steved.

> ---
>  utils/exportfs/exportfs.c |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
> index 986a272..7432a65 100644
> --- a/utils/exportfs/exportfs.c
> +++ b/utils/exportfs/exportfs.c
> @@ -529,9 +529,12 @@ export_d_read(const char *dname)
>  
>  
>  	n = scandir(dname, &namelist, NULL, versionsort);
> -	if (n < 0)
> +	if (n < 0) {
> +		if (errno == ENOENT)
> +			/* Silently return */
> +			return;
>  		xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
> -	else if (n == 0)
> +	} else if (n == 0)
>  		return;
>  
>  	for (i = 0; i < n; i++) {

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] exportfs: do not warn if /etc/exports.d/ does not exist
  2011-09-01 15:35   ` Steve Dickson
@ 2011-09-02  0:40     ` Masatake YAMATO
  2011-09-02 20:52       ` Steve Dickson
  0 siblings, 1 reply; 6+ messages in thread
From: Masatake YAMATO @ 2011-09-02  0:40 UTC (permalink / raw)
  To: SteveD; +Cc: vapier, linux-nfs

I've tried this issue in different way:)
Steve, could you see this bug?

      https://bugzilla.redhat.com/show_bug.cgi?id=697006

Masatake YAMATO


On Thu, 01 Sep 2011 11:35:56 -0400, Steve Dickson <SteveD@redhat.com> wrote
> 
> 
> On 09/01/2011 11:16 AM, Mike Frysinger wrote:
>> It isn't uncommon for /etc/exports.d/ to not exist, and imo, it's not
>> that big of a deal as often times, a simple /etc/exports is sufficient.
>> So silently skip the case where the dir is missing.
>> 
>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> Committed...
> 
> steved.
> 
>> ---
>>  utils/exportfs/exportfs.c |    7 +++++--
>>  1 files changed, 5 insertions(+), 2 deletions(-)
>> 
>> diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
>> index 986a272..7432a65 100644
>> --- a/utils/exportfs/exportfs.c
>> +++ b/utils/exportfs/exportfs.c
>> @@ -529,9 +529,12 @@ export_d_read(const char *dname)
>>  
>>  
>>  	n = scandir(dname, &namelist, NULL, versionsort);
>> -	if (n < 0)
>> +	if (n < 0) {
>> +		if (errno == ENOENT)
>> +			/* Silently return */
>> +			return;
>>  		xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
>> -	else if (n == 0)
>> +	} else if (n == 0)
>>  		return;
>>  
>>  	for (i = 0; i < n; i++) {
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] exportfs: do not warn if /etc/exports.d/ does not exist
  2011-09-02  0:40     ` Masatake YAMATO
@ 2011-09-02 20:52       ` Steve Dickson
  0 siblings, 0 replies; 6+ messages in thread
From: Steve Dickson @ 2011-09-02 20:52 UTC (permalink / raw)
  To: Masatake YAMATO; +Cc: vapier, linux-nfs



On 09/01/2011 08:40 PM, Masatake YAMATO wrote:
> I've tried this issue in different way:)
> Steve, could you see this bug?
> 
>       https://bugzilla.redhat.com/show_bug.cgi?id=697006
Fair enough....  but the patch in that bz is distro specific, 
means it would have no affect on other distros... With that
said, your patch is a good idea so I will added my todo list

steved.
> 
> Masatake YAMATO
> 
> 
> On Thu, 01 Sep 2011 11:35:56 -0400, Steve Dickson <SteveD@redhat.com> wrote
>>
>>
>> On 09/01/2011 11:16 AM, Mike Frysinger wrote:
>>> It isn't uncommon for /etc/exports.d/ to not exist, and imo, it's not
>>> that big of a deal as often times, a simple /etc/exports is sufficient.
>>> So silently skip the case where the dir is missing.
>>>
>>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>> Committed...
>>
>> steved.
>>
>>> ---
>>>  utils/exportfs/exportfs.c |    7 +++++--
>>>  1 files changed, 5 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
>>> index 986a272..7432a65 100644
>>> --- a/utils/exportfs/exportfs.c
>>> +++ b/utils/exportfs/exportfs.c
>>> @@ -529,9 +529,12 @@ export_d_read(const char *dname)
>>>  
>>>  
>>>  	n = scandir(dname, &namelist, NULL, versionsort);
>>> -	if (n < 0)
>>> +	if (n < 0) {
>>> +		if (errno == ENOENT)
>>> +			/* Silently return */
>>> +			return;
>>>  		xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
>>> -	else if (n == 0)
>>> +	} else if (n == 0)
>>>  		return;
>>>  
>>>  	for (i = 0; i < n; i++) {
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-09-02 20:52 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-01 15:16 [PATCH 1/2] exportfs: drop extra newline in xlog Mike Frysinger
2011-09-01 15:16 ` [PATCH 2/2] exportfs: do not warn if /etc/exports.d/ does not exist Mike Frysinger
2011-09-01 15:35   ` Steve Dickson
2011-09-02  0:40     ` Masatake YAMATO
2011-09-02 20:52       ` Steve Dickson
2011-09-01 15:35 ` [PATCH 1/2] exportfs: drop extra newline in xlog Steve Dickson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.