From d217886c962b05ab7aa751923016e3ccb4dd7534 Mon Sep 17 00:00:00 2001
From: Michael Barz <mbarz@owncloud.com>
Date: Mon, 14 Feb 2022 11:57:47 +0100
Subject: [PATCH] fix xattr error types, remove error wrapper (#2541)

Signed-off-by: Michael Barz <mbarz@owncloud.com>
---
 changelog/unreleased/decomposedfs-xattr-errors.md |  1 +
 pkg/storage/utils/decomposedfs/xattrs/errors.go   |  3 ---
 pkg/storage/utils/decomposedfs/xattrs/xattrs.go   | 11 +++++------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/changelog/unreleased/decomposedfs-xattr-errors.md b/changelog/unreleased/decomposedfs-xattr-errors.md
index 3b21b1baf8..3d24b18bc6 100644
--- a/changelog/unreleased/decomposedfs-xattr-errors.md
+++ b/changelog/unreleased/decomposedfs-xattr-errors.md
@@ -3,3 +3,4 @@ Enhancement: Refactored the xattrs package in the decomposedfs
 The xattrs package now uses the xattr.ENOATTR instead of os.ENODATA or os.ENOATTR to check attribute existence.
 
 https://github.com/cs3org/reva/pull/2540
+https://github.com/cs3org/reva/pull/2541
diff --git a/pkg/storage/utils/decomposedfs/xattrs/errors.go b/pkg/storage/utils/decomposedfs/xattrs/errors.go
index fb91cebd4c..e906376c6f 100644
--- a/pkg/storage/utils/decomposedfs/xattrs/errors.go
+++ b/pkg/storage/utils/decomposedfs/xattrs/errors.go
@@ -16,9 +16,6 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-//go:build !darwin
-// +build !darwin
-
 package xattrs
 
 import (
diff --git a/pkg/storage/utils/decomposedfs/xattrs/xattrs.go b/pkg/storage/utils/decomposedfs/xattrs/xattrs.go
index b9b14b6636..ea14aaa59f 100644
--- a/pkg/storage/utils/decomposedfs/xattrs/xattrs.go
+++ b/pkg/storage/utils/decomposedfs/xattrs/xattrs.go
@@ -23,7 +23,6 @@ import (
 	"strings"
 
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
-	"github.com/pkg/errors"
 	"github.com/pkg/xattr"
 )
 
@@ -137,7 +136,7 @@ func CopyMetadata(s, t string, filter func(attributeName string) bool) error {
 func Set(filePath string, key string, val string) error {
 
 	if err := xattr.Set(filePath, key, []byte(val)); err != nil {
-		return errors.Wrap(err, "xattrs: Could not write xtended attribute")
+		return err
 	}
 	return nil
 }
@@ -160,7 +159,7 @@ func Get(filePath, key string) (string, error) {
 
 	v, err := xattr.Get(filePath, key)
 	if err != nil {
-		return "", errors.Wrap(err, "xattrs: Can not read xattr")
+		return "", err
 	}
 	val := string(v)
 	return val, nil
@@ -174,7 +173,7 @@ func GetInt64(filePath, key string) (int64, error) {
 	}
 	v, err := strconv.ParseInt(attr, 10, 64)
 	if err != nil {
-		return 0, errors.Wrapf(err, "invalid xattr format")
+		return 0, err
 	}
 	return v, nil
 }
@@ -183,14 +182,14 @@ func GetInt64(filePath, key string) (int64, error) {
 func All(filePath string) (map[string]string, error) {
 	attrNames, err := xattr.List(filePath)
 	if err != nil {
-		return nil, errors.Wrap(err, "xattrs: Can not list extended attributes")
+		return nil, err
 	}
 
 	attribs := make(map[string]string, len(attrNames))
 	for _, name := range attrNames {
 		val, err := xattr.Get(filePath, name)
 		if err != nil {
-			return nil, errors.Wrap(err, "Failed to read extended attrib")
+			return nil, err
 		}
 		attribs[name] = string(val)
 	}