summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xlators/features/locks/src/inodelk.c2
-rw-r--r--xlators/features/quota/src/quota.c10
-rw-r--r--xlators/mount/fuse/src/fuse-bridge.c4
-rw-r--r--xlators/protocol/client/src/client3_1-fops.c13
-rw-r--r--xlators/protocol/server/src/server3_1-fops.c12
-rw-r--r--xlators/storage/posix/src/posix.c4
6 files changed, 23 insertions, 22 deletions
diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c
index 8ac5e4049f7..bc59ea85830 100644
--- a/xlators/features/locks/src/inodelk.c
+++ b/xlators/features/locks/src/inodelk.c
@@ -585,6 +585,8 @@ pl_common_inodelk (call_frame_t *frame, xlator_t *this,
"Releasing all locks from transport %p", transport);
release_inode_locks_of_transport (this, dom, inode, transport);
+
+ op_ret = 0;
goto unwind;
}
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c
index dc936b284b9..5d1f304f4be 100644
--- a/xlators/features/quota/src/quota.c
+++ b/xlators/features/quota/src/quota.c
@@ -1489,8 +1489,10 @@ quota_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
size = buf->ia_blocks * 512;
}
- quota_update_size (this, local->oldloc.parent, NULL, 0, (-size));
- quota_update_size (this, local->newloc.parent, NULL, 0, size);
+ if (local->oldloc.parent != local->newloc.parent) {
+ quota_update_size (this, local->oldloc.parent, NULL, 0, (-size));
+ quota_update_size (this, local->newloc.parent, NULL, 0, size);
+ }
if (!(IA_ISREG (local->oldloc.inode->ia_type)
|| IA_ISLNK (local->oldloc.inode->ia_type))) {
@@ -2083,7 +2085,7 @@ quota_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
quota_inode_ctx_get (local->loc.inode, -1, this, NULL, NULL,
&ctx, 0);
if (ctx == NULL) {
- gf_log (this->name, GF_LOG_WARNING,
+ gf_log (this->name, GF_LOG_DEBUG,
"quota context not set in inode (ino:%"PRId64
", gfid:%s)", local->loc.inode->ino,
uuid_utoa (local->loc.inode->gfid));
@@ -2416,7 +2418,7 @@ quota_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
quota_inode_ctx_get (local->loc.inode, -1, this, NULL, NULL,
&ctx, 0);
if (ctx == NULL) {
- gf_log (this->name, GF_LOG_WARNING,
+ gf_log (this->name, GF_LOG_DEBUG,
"quota context not set in inode (ino:%"PRId64
", gfid:%s)", local->loc.inode->ino,
uuid_utoa (local->loc.inode->gfid));
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index 6fa484acbc2..d34a747f4bb 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -2493,9 +2493,9 @@ fuse_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
"storage");
} else {
gf_log ("glusterfs-fuse", GF_LOG_WARNING,
- "%"PRIu64": %s() %s => -1 (%s)",
+ "%"PRIu64": %s(%s) %s => -1 (%s)",
frame->root->unique,
- gf_fop_list[frame->root->op],
+ gf_fop_list[frame->root->op], state->name,
state->loc.path, strerror (op_errno));
}
} else {
diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c
index 492c469d84d..f1f6bd0a4d6 100644
--- a/xlators/protocol/client/src/client3_1-fops.c
+++ b/xlators/protocol/client/src/client3_1-fops.c
@@ -887,7 +887,7 @@ client3_1_getxattr_cbk (struct rpc_req *req, struct iovec *iov, int count,
out:
if (rsp.op_ret == -1) {
gf_log (this->name, GF_LOG_INFO, "remote operation failed: %s",
- strerror (gf_error_to_errno (rsp.op_errno)));
+ strerror (op_errno));
}
STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, dict);
@@ -970,7 +970,7 @@ client3_1_fgetxattr_cbk (struct rpc_req *req, struct iovec *iov, int count,
out:
if (rsp.op_ret == -1) {
gf_log (this->name, GF_LOG_INFO, "remote operation failed: %s",
- strerror (gf_error_to_errno (rsp.op_errno)));
+ strerror (op_errno));
}
STACK_UNWIND_STRICT (fgetxattr, frame, op_ret, op_errno, dict);
if (rsp.dict.dict_val) {
@@ -2212,7 +2212,7 @@ client3_1_lookup_cbk (struct rpc_req *req, struct iovec *iov, int count,
gf_log (frame->this->name, GF_LOG_DEBUG,
"gfid changed for %s", local->loc.path);
rsp.op_ret = -1;
- rsp.op_errno = ESTALE;
+ op_errno = ESTALE;
goto out;
}
@@ -2222,11 +2222,10 @@ out:
rsp.op_errno = op_errno;
frame->local = NULL;
if (rsp.op_ret == -1) {
- /* any error other than ENOENT or for revalidate for ENOENT too */
- if ((gf_error_to_errno (rsp.op_errno) != ENOENT) ||
- !uuid_is_null (local->loc.inode->gfid))
+ /* any error other than ENOENT */
+ if (rsp.op_errno != ENOENT)
gf_log (this->name, GF_LOG_INFO, "remote operation failed: %s",
- strerror (gf_error_to_errno (rsp.op_errno)));
+ strerror (rsp.op_errno));
else
gf_log (this->name, GF_LOG_TRACE, "not found on remote node");
diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c
index eb51640d9a4..569a4674245 100644
--- a/xlators/protocol/server/src/server3_1-fops.c
+++ b/xlators/protocol/server/src/server3_1-fops.c
@@ -161,7 +161,7 @@ out:
if (op_ret) {
gf_log (this->name,
- (op_errno == ENOENT ? GF_LOG_TRACE : GF_LOG_INFO),
+ ((op_errno == ENOENT) ? GF_LOG_TRACE : GF_LOG_INFO),
"%"PRId64": LOOKUP %s (%"PRId64") ==> %"PRId32" (%s)",
frame->root->unique, state->loc.path,
state->loc.inode ? state->loc.inode->ino : 0,
@@ -736,10 +736,9 @@ out:
rsp.dict.dict_len = len;
if (op_ret == -1)
gf_log (this->name, GF_LOG_INFO,
- "%"PRId64": GETXATTR %s (%"PRId64") ==> %"PRId32" (%s)",
+ "%"PRId64": GETXATTR %s (%s) ==> %"PRId32" (%s)",
frame->root->unique, state->loc.path,
- state->loc.inode ? state->loc.inode->ino : 0,
- op_ret, strerror (op_errno));
+ state->name, op_ret, strerror (op_errno));
server_submit_reply (frame, req, &rsp, NULL, 0, NULL,
xdr_serialize_getxattr_rsp);
@@ -801,10 +800,9 @@ out:
rsp.dict.dict_len = len;
if (op_ret == -1)
gf_log (this->name, GF_LOG_INFO,
- "%"PRId64": FGETXATTR %"PRId64" (%"PRId64") ==> %"PRId32" (%s)",
+ "%"PRId64": FGETXATTR %"PRId64" (%s) ==> %"PRId32" (%s)",
frame->root->unique, state->resolve.fd_no,
- state->fd ? state->fd->inode->ino : 0, op_ret,
- strerror (op_errno));
+ state->name, op_ret, strerror (op_errno));
server_submit_reply (frame, req, &rsp, NULL, 0, NULL,
xdr_serialize_fgetxattr_rsp);
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index 7f2c9ab1f23..0cd6883c1b3 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -3460,8 +3460,8 @@ posix_removexattr (call_frame_t *frame, xlator_t *this,
op_errno = errno;
if (op_errno != ENOATTR && op_errno != EPERM)
gf_log (this->name, GF_LOG_ERROR,
- "removexattr on %s: %s", loc->path,
- strerror (op_errno));
+ "removexattr on %s (for %s): %s", loc->path,
+ name, strerror (op_errno));
goto out;
}
generated by cgit (git 2.34.1) at 2024-04-24 19:15:54 +0000