vfs:ignore all unsupported xattr flags on the MacOS platform

juicedata · Nov 28, 2024 · 993d518 · 993d518
1 parent 4bdf11a
commit 993d518
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/pkg/meta/utils_darwin.go b/pkg/meta/utils_darwin.go
@@ -17,6 +17,10 @@ const (
 	XattrCreateOrReplace = 0
 	XattrCreate          = sys.XATTR_CREATE
 	XattrReplace         = sys.XATTR_REPLACE
-	XattrNoSecurity      = sys.XATTR_NOSECURITY
-	XattrNoFollow        = sys.XATTR_NOFOLLOW
+
+	//not supported
+	XattrNoSecurity       = sys.XATTR_NOSECURITY
+	XATTR_NODEFAULT       = sys.XATTR_NODEFAULT
+	XattrNoFollow         = sys.XATTR_NOFOLLOW
+	XATTR_SHOWCOMPRESSION = sys.XATTR_SHOWCOMPRESSION
 )
diff --git a/pkg/meta/utils_linux.go b/pkg/meta/utils_linux.go
@@ -14,9 +14,11 @@ const (
 )
 
 const (
-	XattrCreateOrReplace = 0
-	XattrCreate          = sys.XATTR_CREATE
-	XattrReplace         = sys.XATTR_REPLACE
-	XattrNoSecurity      = 8
-	XattrNoFollow        = 16
+	XattrCreateOrReplace  = 0
+	XattrCreate           = sys.XATTR_CREATE
+	XattrReplace          = sys.XATTR_REPLACE
+	XattrNoSecurity       = 8
+	XATTR_NODEFAULT       = 10
+	XattrNoFollow         = 16
+	XATTR_SHOWCOMPRESSION = 20
 )
diff --git a/pkg/meta/utils_windows.go b/pkg/meta/utils_windows.go
@@ -27,9 +27,11 @@ const (
 )
 
 const (
-	XattrCreateOrReplace = 0
-	XattrCreate          = 1
-	XattrReplace         = 2
-	XattrNoSecurity      = 8
-	XattrNoFollow        = 16
+	XattrCreateOrReplace  = 0
+	XattrCreate           = 1
+	XattrReplace          = 2
+	XattrNoSecurity       = 8
+	XATTR_NODEFAULT       = 10
+	XattrNoFollow         = 16
+	XATTR_SHOWCOMPRESSION = 20
 )
diff --git a/pkg/vfs/vfs.go b/pkg/vfs/vfs.go
@@ -1036,6 +1036,8 @@ const (
 	xattrMaxSize = 65536
 )
 
+var macUnSupportFlags = meta.XattrNoSecurity | meta.XATTR_NODEFAULT | meta.XattrNoFollow | meta.XATTR_SHOWCOMPRESSION
+
 func (v *VFS) SetXattr(ctx Context, ino Ino, name string, value []byte, flags uint32) (err syscall.Errno) {
 	defer func() { logit(ctx, "setxattr", err, "(%d,%s,%d,%d)", ino, name, len(value), flags) }()
 	if IsSpecialNode(ino) {
@@ -1078,12 +1080,9 @@ func (v *VFS) SetXattr(ctx Context, ino Ino, name string, value []byte, flags ui
 		err = v.Meta.SetFacl(ctx, ino, aclType, rule)
 		v.invalidateAttr(ino)
 	} else {
-		// ignore NoSecurity flag
-		if runtime.GOOS == "darwin" && (flags&meta.XattrNoSecurity) != 0 {
-			flags &= ^uint32(meta.XattrNoSecurity)
-		}
-		if runtime.GOOS == "darwin" && (flags&meta.XattrNoFollow) != 0 {
-			flags &= ^uint32(meta.XattrNoFollow)
+		// ignore unsupported flags
+		if runtime.GOOS == "darwin" && (flags&uint32(macUnSupportFlags) != 0) {
+			flags &= ^uint32(macUnSupportFlags)
 		}
 		err = v.Meta.SetXattr(ctx, ino, name, value, flags)
 	}