nfs-utils: add missing comma for exports ent

PATCH In review Kinglong Mee 3 participants 3 messages Apr 5, 2015 – Apr 6, 2015

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

Kinglong Mee

author

2015-04-05 14:09 UTC #0 lore raw

PATCH 1/1 nfs-utils: add missing comma for exports ent

When using pnfs with "fsid=0", exportfs prints error as,

# exportfs -a
exportfs: /var/lib/nfs/etab:1: unknown keyword "no_pnfsfsid=0"

Commit cdd16bef98 ("nfs-utils: add support for the "pnfs" export option") miss the comma after "pnfs"/"on_pnfs" operation.

Signed-off-by Kinglong Mee <[email protected]>

---
 support/nfs/exports.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

support/nfs/exports.c +1 -1

index 9b325b9..761a046 100644
@@ -275,7 +275,7 @@ putexportent(struct exportent *ep)
 		"no_" : "");
 	if (ep->e_flags & NFSEXP_NOREADDIRPLUS)
 		fprintf(fp, "nordirplus,");
-	fprintf(fp, "%spnfs", (ep->e_flags & NFSEXP_PNFS)? "" : "no_");
+	fprintf(fp, "%spnfs,", (ep->e_flags & NFSEXP_PNFS)? "" : "no_");
 	if (ep->e_flags & NFSEXP_FSID) {
 		fprintf(fp, "fsid=%d,", ep->e_fsid);
 	}

Signature · 1 line

2.3.4

Christoph Hellwig

Reviewed-by on v1 1/1

2015-04-06 12:01 UTC #1 lore raw

Thanks, sorry for messing up the last minute update..

Reviewed-by Christoph Hellwig <[email protected]>

Steve Dickson

2015-04-06 21:14 UTC #2 lore raw

In reply to Kinglong Mee

Quoted 9 lines · Kinglong Mee

When using pnfs with "fsid=0", exportfs prints error as,
# exportfs -a
exportfs: /var/lib/nfs/etab:1: unknown keyword "no_pnfsfsid=0"
Commit cdd16bef98 ("nfs-utils: add support for the "pnfs" export option") miss the comma after "pnfs"/"on_pnfs" operation.
Signed-off-by Kinglong Mee <[email protected]>

Committed...

steved.

Quoted 18 lines

---
 support/nfs/exports.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

support/nfs/exports.c +1 -1

index 9b325b9..761a046 100644
@@ -275,7 +275,7 @@ putexportent(struct exportent *ep)
 		"no_" : "");
 	if (ep->e_flags & NFSEXP_NOREADDIRPLUS)
 		fprintf(fp, "nordirplus,");
-	fprintf(fp, "%spnfs", (ep->e_flags & NFSEXP_PNFS)? "" : "no_");
+	fprintf(fp, "%spnfs,", (ep->e_flags & NFSEXP_PNFS)? "" : "no_");
 	if (ep->e_flags & NFSEXP_FSID) {
 		fprintf(fp, "fsid=%d,", ep->e_fsid);
 	}