diff options
| author | Amar Tumballi <amar@gluster.com> | 2011-06-08 23:37:22 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-06-16 09:15:28 -0700 |
| commit | e719518e561033af0ffd07d0c8ad7d777715fe89 (patch) | |
| tree | 8ede0ce4fbe1985dcbc749fd786c75de8cae00d5 /xlators/features | |
| parent | dad63fa8ac00397e337f328b0bb7b641e2680932 (diff) | |
fixing some build issues in Mac OS X
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 2966 (MacOSX compile failure: duplicate symbol _k)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2966
Diffstat (limited to 'xlators/features')
| -rw-r--r-- | xlators/features/marker/src/marker-quota.c | 3 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker-quota.h | 4 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker.h | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index 18d76dc589d..4662c989d91 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -1655,7 +1655,6 @@ quota_xattr_state (xlator_t *this, { if (buf.ia_type == IA_IFREG || buf.ia_type == IA_IFLNK) { - k ++; inspect_file_xattr (this, loc, dict, buf); } else if (buf.ia_type == IA_IFDIR) inspect_directory_xattr (this, loc, dict, buf); @@ -1913,8 +1912,6 @@ out: int32_t init_quota_priv (xlator_t *this) { - strcpy (volname, "quota"); - return 0; } diff --git a/xlators/features/marker/src/marker-quota.h b/xlators/features/marker/src/marker-quota.h index 802c1d922af..ea433a455ec 100644 --- a/xlators/features/marker/src/marker-quota.h +++ b/xlators/features/marker/src/marker-quota.h @@ -32,11 +32,9 @@ #define QUOTA_DIRTY_KEY "trusted.glusterfs.quota.dirty" #define CONTRIBUTION "contri" -#define VOL_NAME volname #define CONTRI_KEY_MAX 512 #define READDIR_BUF 4096 -char volname [40]; #define QUOTA_STACK_DESTROY(_frame, _this) \ do { \ @@ -79,7 +77,7 @@ char volname [40]; char _gfid_unparsed[40]; \ uuid_unparse (_gfid, _gfid_unparsed); \ _ret = snprintf (var, CONTRI_KEY_MAX, QUOTA_XATTR_PREFIX \ - ".%s.%s." CONTRIBUTION, VOL_NAME, \ + ".%s.%s." CONTRIBUTION, "quota", \ _gfid_unparsed); \ } while (0); diff --git a/xlators/features/marker/src/marker.h b/xlators/features/marker/src/marker.h index ea1f5cc0a99..1e62e5cbc84 100644 --- a/xlators/features/marker/src/marker.h +++ b/xlators/features/marker/src/marker.h @@ -91,5 +91,4 @@ struct marker_conf{ }; typedef struct marker_conf marker_conf_t; -int32_t k; #endif |