| Message ID | 1427876113-27004-1-git-send-email-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
----- Original Message ----- > From: "Christoph Hellwig" <hch@lst.de> > To: "Steve Dickson" <SteveD@redhat.com> > Cc: linux-nfs@vger.kernel.org > Sent: Wednesday, April 1, 2015 10:15:13 AM > Subject: [PATCH] nfs-utils: add support for the "pnfs" export option > This goes along with the patch just sent to Bruce to make pnfs > support conditional. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > support/include/nfs/export.h | 1 + > support/nfs/exports.c | 3 +++ > utils/exportfs/exportfs.c | 2 ++ > 3 files changed, 6 insertions(+) > > diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h > index 2f59e6a..1194255 100644 > --- a/support/include/nfs/export.h > +++ b/support/include/nfs/export.h > @@ -26,6 +26,7 @@ > #define NFSEXP_CROSSMOUNT 0x4000 > #define NFSEXP_NOACL 0x8000 /* reserved for possible ACL related use */ > #define NFSEXP_V4ROOT 0x10000 > +#define NFSEXP_PNFS 0x20000 > /* > * All flags supported by the kernel before addition of the > * export_features interface: > diff --git a/support/nfs/exports.c b/support/nfs/exports.c > index 4b17d3c..97f9e67 100644 > --- a/support/nfs/exports.c > +++ b/support/nfs/exports.c > @@ -275,6 +275,7 @@ putexportent(struct exportent *ep) > "no_" : ""); > if (ep->e_flags & NFSEXP_NOREADDIRPLUS) > fprintf(fp, "nordirplus,"); > + fprintf(fp, "%s", (ep->e_flags & NFSEXP_PNFS)? "pnfs," : ""); > if (ep->e_flags & NFSEXP_FSID) { > fprintf(fp, "fsid=%d,", ep->e_fsid); > } > @@ -581,6 +582,8 @@ parseopts(char *cp, struct exportent *ep, int warn, int > *had_subtree_opt_ptr) > clearflags(NFSEXP_NOACL, active, ep); > else if (strcmp(opt, "no_acl") == 0) > setflags(NFSEXP_NOACL, active, ep); > + else if (!strcmp(opt, "pnfs")) > + setflags(NFSEXP_PNFS, active, ep); and no_pnfs as well to match other options. Tigran. > else if (strncmp(opt, "anonuid=", 8) == 0) { > char *oe; > ep->e_anonuid = strtol(opt+8, &oe, 10); > diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c > index 48eac00..8758231 100644 > --- a/utils/exportfs/exportfs.c > +++ b/utils/exportfs/exportfs.c > @@ -821,6 +821,8 @@ dump(int verbose, int export_format) > c = dumpopt(c, "nordirplus"); > if (ep->e_flags & NFSEXP_NOACL) > c = dumpopt(c, "no_acl"); > + if (ep->e_flags & NFSEXP_PNFS) > + c = dumpopt(c, "pnfs"); > if (ep->e_flags & NFSEXP_FSID) > c = dumpopt(c, "fsid=%d", ep->e_fsid); > if (ep->e_uuid) > -- > 1.9.1 > > -- > 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 -- 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
On Wed, Apr 01, 2015 at 10:15:13AM +0200, Christoph Hellwig wrote: > This goes along with the patch just sent to Bruce to make pnfs > support conditional. Could we get an update of utils/exportfs/exports.man too? --b. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > support/include/nfs/export.h | 1 + > support/nfs/exports.c | 3 +++ > utils/exportfs/exportfs.c | 2 ++ > 3 files changed, 6 insertions(+) > > diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h > index 2f59e6a..1194255 100644 > --- a/support/include/nfs/export.h > +++ b/support/include/nfs/export.h > @@ -26,6 +26,7 @@ > #define NFSEXP_CROSSMOUNT 0x4000 > #define NFSEXP_NOACL 0x8000 /* reserved for possible ACL related use */ > #define NFSEXP_V4ROOT 0x10000 > +#define NFSEXP_PNFS 0x20000 > /* > * All flags supported by the kernel before addition of the > * export_features interface: > diff --git a/support/nfs/exports.c b/support/nfs/exports.c > index 4b17d3c..97f9e67 100644 > --- a/support/nfs/exports.c > +++ b/support/nfs/exports.c > @@ -275,6 +275,7 @@ putexportent(struct exportent *ep) > "no_" : ""); > if (ep->e_flags & NFSEXP_NOREADDIRPLUS) > fprintf(fp, "nordirplus,"); > + fprintf(fp, "%s", (ep->e_flags & NFSEXP_PNFS)? "pnfs," : ""); > if (ep->e_flags & NFSEXP_FSID) { > fprintf(fp, "fsid=%d,", ep->e_fsid); > } > @@ -581,6 +582,8 @@ parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr) > clearflags(NFSEXP_NOACL, active, ep); > else if (strcmp(opt, "no_acl") == 0) > setflags(NFSEXP_NOACL, active, ep); > + else if (!strcmp(opt, "pnfs")) > + setflags(NFSEXP_PNFS, active, ep); > else if (strncmp(opt, "anonuid=", 8) == 0) { > char *oe; > ep->e_anonuid = strtol(opt+8, &oe, 10); > diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c > index 48eac00..8758231 100644 > --- a/utils/exportfs/exportfs.c > +++ b/utils/exportfs/exportfs.c > @@ -821,6 +821,8 @@ dump(int verbose, int export_format) > c = dumpopt(c, "nordirplus"); > if (ep->e_flags & NFSEXP_NOACL) > c = dumpopt(c, "no_acl"); > + if (ep->e_flags & NFSEXP_PNFS) > + c = dumpopt(c, "pnfs"); > if (ep->e_flags & NFSEXP_FSID) > c = dumpopt(c, "fsid=%d", ep->e_fsid); > if (ep->e_uuid) > -- > 1.9.1 > > -- > 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 -- 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
On Wed, Apr 01, 2015 at 01:48:09PM -0400, J. Bruce Fields wrote: > On Wed, Apr 01, 2015 at 10:15:13AM +0200, Christoph Hellwig wrote: > > This goes along with the patch just sent to Bruce to make pnfs > > support conditional. > > Could we get an update of utils/exportfs/exports.man too? Yes, v3 will follow ASAP. Should have read my whole inbox before starting to update the patch.. -- 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
diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h index 2f59e6a..1194255 100644 --- a/support/include/nfs/export.h +++ b/support/include/nfs/export.h @@ -26,6 +26,7 @@ #define NFSEXP_CROSSMOUNT 0x4000 #define NFSEXP_NOACL 0x8000 /* reserved for possible ACL related use */ #define NFSEXP_V4ROOT 0x10000 +#define NFSEXP_PNFS 0x20000 /* * All flags supported by the kernel before addition of the * export_features interface: diff --git a/support/nfs/exports.c b/support/nfs/exports.c index 4b17d3c..97f9e67 100644 --- a/support/nfs/exports.c +++ b/support/nfs/exports.c @@ -275,6 +275,7 @@ putexportent(struct exportent *ep) "no_" : ""); if (ep->e_flags & NFSEXP_NOREADDIRPLUS) fprintf(fp, "nordirplus,"); + fprintf(fp, "%s", (ep->e_flags & NFSEXP_PNFS)? "pnfs," : ""); if (ep->e_flags & NFSEXP_FSID) { fprintf(fp, "fsid=%d,", ep->e_fsid); } @@ -581,6 +582,8 @@ parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr) clearflags(NFSEXP_NOACL, active, ep); else if (strcmp(opt, "no_acl") == 0) setflags(NFSEXP_NOACL, active, ep); + else if (!strcmp(opt, "pnfs")) + setflags(NFSEXP_PNFS, active, ep); else if (strncmp(opt, "anonuid=", 8) == 0) { char *oe; ep->e_anonuid = strtol(opt+8, &oe, 10); diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index 48eac00..8758231 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -821,6 +821,8 @@ dump(int verbose, int export_format) c = dumpopt(c, "nordirplus"); if (ep->e_flags & NFSEXP_NOACL) c = dumpopt(c, "no_acl"); + if (ep->e_flags & NFSEXP_PNFS) + c = dumpopt(c, "pnfs"); if (ep->e_flags & NFSEXP_FSID) c = dumpopt(c, "fsid=%d", ep->e_fsid); if (ep->e_uuid)
This goes along with the patch just sent to Bruce to make pnfs support conditional. Signed-off-by: Christoph Hellwig <hch@lst.de> --- support/include/nfs/export.h | 1 + support/nfs/exports.c | 3 +++ utils/exportfs/exportfs.c | 2 ++ 3 files changed, 6 insertions(+)