summaryrefslogtreecommitdiffstats
path: root/xlators/protocol
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2011-04-12 05:02:00 +0000
committerAnand Avati <avati@gluster.com>2011-04-12 21:50:01 -0700
commit9c26fbc70ab797eea7967bc77857e73eca9aeffe (patch)
tree7a69b95d25a5361f07ef7181d53b6fe123791bfb /xlators/protocol
parent6a2c2fa4f13f9ed96098c4fec40f747e171e6819 (diff)
protocol/client: convert to errno before checking for EAGAIN
in *lk_cbk() functions. Network error code may be different than what is actual errno code. Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2346 (Log message enhancements in GlusterFS - phase 1) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2346
Diffstat (limited to 'xlators/protocol')
-rw-r--r--xlators/protocol/client/src/client3_1-fops.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c
index 5b6971dde..492c469d8 100644
--- a/xlators/protocol/client/src/client3_1-fops.c
+++ b/xlators/protocol/client/src/client3_1-fops.c
@@ -1220,7 +1220,8 @@ client3_1_inodelk_cbk (struct rpc_req *req, struct iovec *iov, int count,
}
out:
- if ((rsp.op_ret == -1) && (EAGAIN != rsp.op_errno)) {
+ if ((rsp.op_ret == -1) &&
+ (EAGAIN != gf_error_to_errno (rsp.op_errno))) {
gf_log (this->name, GF_LOG_INFO, "remote operation failed: %s",
strerror (gf_error_to_errno (rsp.op_errno)));
}
@@ -1257,7 +1258,8 @@ client3_1_finodelk_cbk (struct rpc_req *req, struct iovec *iov, int count,
}
out:
- if ((rsp.op_ret == -1) && (EAGAIN != rsp.op_errno)) {
+ if ((rsp.op_ret == -1) &&
+ (EAGAIN != gf_error_to_errno (rsp.op_errno))) {
gf_log (this->name, GF_LOG_INFO, "remote operation failed: %s",
strerror (gf_error_to_errno (rsp.op_errno)));
}
@@ -1295,7 +1297,8 @@ client3_1_entrylk_cbk (struct rpc_req *req, struct iovec *iov, int count,
out:
- if ((rsp.op_ret == -1) && (EAGAIN != rsp.op_errno)) {
+ if ((rsp.op_ret == -1) &&
+ (EAGAIN != gf_error_to_errno (rsp.op_errno))) {
gf_log (this->name, GF_LOG_INFO, "remote operation failed: %s",
strerror (gf_error_to_errno (rsp.op_errno)));
}
@@ -1332,7 +1335,8 @@ client3_1_fentrylk_cbk (struct rpc_req *req, struct iovec *iov, int count,
}
out:
- if ((rsp.op_ret == -1) && (EAGAIN != rsp.op_errno)) {
+ if ((rsp.op_ret == -1) &&
+ (EAGAIN != gf_error_to_errno (rsp.op_errno))) {
gf_log (this->name, GF_LOG_INFO, "remote operation failed: %s",
strerror (gf_error_to_errno (rsp.op_errno)));
}
@@ -1824,7 +1828,8 @@ client3_1_lk_cbk (struct rpc_req *req, struct iovec *iov, int count,
client_local_wipe (local);
out:
- if ((rsp.op_ret == -1) && (EAGAIN != rsp.op_errno)) {
+ if ((rsp.op_ret == -1) &&
+ (EAGAIN != gf_error_to_errno (rsp.op_errno))) {
gf_log (this->name, GF_LOG_INFO, "remote operation failed: %s",
strerror (gf_error_to_errno (rsp.op_errno)));
}