From: Ned Bass <bass6@llnl.gov>
Date: Fri, 6 Dec 2013 23:56:22 +0000 (-0800)
Subject: Revert "Use directory xattrs for symlinks"
X-Git-Tag: zfs-0.6.3~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6e335bfc489c08bb92a8667e71fa7f69e87d960;p=zfs

Revert "Use directory xattrs for symlinks"

This reverts commit 6a7c0ccca44ad02c476a111d8f7911fc8b12fff7.

A proper fix for Issue #1648 was landed under Issue #1890, so this is no
longer needed.

Signed-off-by: Ned Bass <bass6@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1648
---

diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c
index 63dca3ae7..8ee3d2fb5 100644
--- a/module/zfs/zpl_xattr.c
+++ b/module/zfs/zpl_xattr.c
@@ -446,10 +446,6 @@ zpl_xattr_set_sa(struct inode *ip, const char *name, const void *value,
 		if (error == -ENOENT)
 			error = zpl_xattr_set_dir(ip, name, NULL, 0, flags, cr);
 	} else {
-		/* Do not allow SA xattrs in symlinks (issue #1648) */
-		if (S_ISLNK(ip->i_mode))
-			return (-EMLINK);
-
 		/* Limited to 32k to keep nvpair memory allocations small */
 		if (size > DXATTR_MAX_ENTRY_SIZE)
 			return (-EFBIG);