diff options
| author | shishir gowda <shishirng@gluster.com> | 2011-02-17 07:31:18 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2011-02-22 02:11:25 -0800 |
| commit | 65e5cc0f394e1d2faaab3dc5d097a3f01b03dd41 (patch) | |
| tree | 5a3c2a80a398c9500334d2178036a4421c349905 /xlators/lib | |
| parent | 46f0277dfcca246b12700b2c6893abcc14480623 (diff) | |
Solaris build fixes
Disable geosync build for non-linux platforms.
And fix solaris related build failures.The symbol getxattr was not
available on solaris. The build on linux passed as getxattr symbol was
available in the library. The argument was not being used, hence
removed it.
Make 64 bit build default in CFLAGS option by passing -m64 option
Signed-off-by: Shishir Gowda <shishirng@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 2440 (Fix solaris build issues seen on latest git)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2440
Diffstat (limited to 'xlators/lib')
| -rw-r--r-- | xlators/lib/src/libxlator.c | 5 | ||||
| -rw-r--r-- | xlators/lib/src/libxlator.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/xlators/lib/src/libxlator.c b/xlators/lib/src/libxlator.c index e7bbe04ba..bd0e11d21 100644 --- a/xlators/lib/src/libxlator.c +++ b/xlators/lib/src/libxlator.c @@ -203,7 +203,7 @@ done: out: if (local->xl_specf_unwind) { frame->local = local->xl_local; - local->xl_specf_unwind (getxattr, frame, op_ret, + local->xl_specf_unwind (frame, op_ret, op_errno, dict); return 0; } @@ -225,7 +225,6 @@ cluster_markeruuid_cbk (call_frame_t *frame, void *cookie, xlator_t *this, struct marker_str *marker = NULL; char *vol_uuid; - if (!this || !frame || !cookie) { gf_log (this->name, GF_LOG_DEBUG, "possible NULL deref"); goto out; @@ -343,7 +342,7 @@ done: out: if (marker->xl_specf_unwind) { frame->local = marker->xl_local; - marker->xl_specf_unwind (getxattr, frame, op_ret, + marker->xl_specf_unwind (frame, op_ret, op_errno, dict); return 0; } diff --git a/xlators/lib/src/libxlator.h b/xlators/lib/src/libxlator.h index 0187e876b..c5e564faf 100644 --- a/xlators/lib/src/libxlator.h +++ b/xlators/lib/src/libxlator.h @@ -24,7 +24,7 @@ #define MARKER_XTIME_TYPE 2 -typedef int32_t (*xlator_specf_unwind_t) (void *getxattr, call_frame_t *frame, +typedef int32_t (*xlator_specf_unwind_t) (call_frame_t *frame, int op_ret, int op_errno, dict_t *dict); |