2018-08-01 20:27:58

by Steve Dickson

Subject: [PATCH] Turn ENOATTR errors into ENODATA errrors

The defining of ENOATTR, which was an defined as ENODATA,
was removed from the attr/xattr.h in modern releases

Signed-off-by: Steve Dickson <[email protected]>
---
libnfs4acl/nfs4_acl_for_path.c | 2 +-
libnfs4acl/nfs4_set_acl.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libnfs4acl/nfs4_acl_for_path.c b/libnfs4acl/nfs4_acl_for_path.c
index a51dc34..2fbf6c9 100644
--- a/libnfs4acl/nfs4_acl_for_path.c
+++ b/libnfs4acl/nfs4_acl_for_path.c
@@ -94,7 +94,7 @@ static int nfs4_getxattr(const char *path, void *value, size_t size)
if (res < -10000) {
fprintf(stderr,"An internal NFS server error code (%d) was returned; this should never happen.\n",res);
} else if (res < 0) {
- if (errno == ENOATTR)
+ if (errno == ENODATA)
fprintf(stderr,"Attribute not found on file: %s\n", path);
else if (errno == EREMOTEIO)
fprintf(stderr,"An NFS server error occurred.\n");
diff --git a/libnfs4acl/nfs4_set_acl.c b/libnfs4acl/nfs4_set_acl.c
index b9edf2b..6c9b072 100644
--- a/libnfs4acl/nfs4_set_acl.c
+++ b/libnfs4acl/nfs4_set_acl.c
@@ -55,7 +55,7 @@ int nfs4_set_acl(struct nfs4_acl *acl, const char *path)
} else if (res < 0) {
if (errno == EOPNOTSUPP)
fprintf(stderr,"Operation to set ACL not supported.\n");
- else if (errno == ENOATTR)
+ else if (errno == ENODATA)
fprintf(stderr,"ACL Attribute not found on file.\n");
else if (errno == EREMOTEIO)
fprintf(stderr,"An NFS server error occurred.\n");
--
2.17.1

2018-08-01 22:47:31

by J. Bruce Fields

Subject: Re: [PATCH] Turn ENOATTR errors into ENODATA errrors

Applied, thanks.--b.

On Wed, Aug 01, 2018 at 02:40:52PM -0400, Steve Dickson wrote:
> The defining of ENOATTR, which was an defined as ENODATA,
> was removed from the attr/xattr.h in modern releases
>
> Signed-off-by: Steve Dickson <[email protected]>
> ---
> libnfs4acl/nfs4_acl_for_path.c | 2 +-
> libnfs4acl/nfs4_set_acl.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libnfs4acl/nfs4_acl_for_path.c b/libnfs4acl/nfs4_acl_for_path.c
> index a51dc34..2fbf6c9 100644
> --- a/libnfs4acl/nfs4_acl_for_path.c
> +++ b/libnfs4acl/nfs4_acl_for_path.c
> @@ -94,7 +94,7 @@ static int nfs4_getxattr(const char *path, void *value, size_t size)
> if (res < -10000) {
> fprintf(stderr,"An internal NFS server error code (%d) was returned; this should never happen.\n",res);
> } else if (res < 0) {
> - if (errno == ENOATTR)
> + if (errno == ENODATA)
> fprintf(stderr,"Attribute not found on file: %s\n", path);
> else if (errno == EREMOTEIO)
> fprintf(stderr,"An NFS server error occurred.\n");
> diff --git a/libnfs4acl/nfs4_set_acl.c b/libnfs4acl/nfs4_set_acl.c
> index b9edf2b..6c9b072 100644
> --- a/libnfs4acl/nfs4_set_acl.c
> +++ b/libnfs4acl/nfs4_set_acl.c
> @@ -55,7 +55,7 @@ int nfs4_set_acl(struct nfs4_acl *acl, const char *path)
> } else if (res < 0) {
> if (errno == EOPNOTSUPP)
> fprintf(stderr,"Operation to set ACL not supported.\n");
> - else if (errno == ENOATTR)
> + else if (errno == ENODATA)
> fprintf(stderr,"ACL Attribute not found on file.\n");
> else if (errno == EREMOTEIO)
> fprintf(stderr,"An NFS server error occurred.\n");
> --
> 2.17.1
>