andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OSX/FreeBSD: Regression fix

Browse Source 
Introduced in "1f6e992f1aaa676be5bd47d17e58f1171825cf43"

Change-Id: I655cf613ca93a749ab5403cb3ec038e739993e2e
BUG: 1146279
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-on: http://review.gluster.org/8841
Reviewed-by: Justin Clift <justin@gluster.org>
Tested-by: Justin Clift <justin@gluster.org>
This commit is contained in:
Harshavardhana 2014-09-24 15:52:58 -07:00
parent b097225202
commit c16408ab40
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xlators/mgmt/glusterd/src/glusterd-quota.c
View File

@ -35,9 +35,6 @@
# ifdef __NetBSD__
# define _PATH_SETFATTR "/usr/pkg/bin/setfattr"
# endif
# ifdef __FreeBSD__
# define _PATH_SETFATTR "/usr/local/bin/setfattr"
# endif
#endif
/* Any negative pid to make it special client */
@ -232,12 +229,27 @@ glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv, char *volname,
runner_add_args (&runner, "/usr/bin/find", "find", ".",
NULL);
else if (type == GF_QUOTA_OPTION_TYPE_DISABLE)
else if (type == GF_QUOTA_OPTION_TYPE_DISABLE) {
#if defined(GF_DARWIN_HOST_OS)
runner_add_args (&runner, "/usr/bin/find", ".",
"-exec", "/usr/bin/xattr", "-w",
VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "1",
"{}", "\\", ";", NULL);
#elif defined(__FreeBSD__)
runner_add_args (&runner, "/usr/bin/find", ".",
"-exec", "/usr/sbin/setextattr",
EXTATTR_NAMESPACE_USER,
VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "1",
"{}", "\\", ";", NULL);
#else
runner_add_args (&runner, "/usr/bin/find", ".",
"-exec", _PATH_SETFATTR, "-n",
VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v",
"1", "{}", "\\", ";", NULL);
#endif
}
if (runner_start (&runner) == -1)
_exit (EXIT_FAILURE);