summaryrefslogtreecommitdiffstats
path: root/xlators/debug
diff options
context:
space:
mode:
authorVikas Gorur <vikas@zresearch.com>2009-03-12 16:21:51 +0530
committerAnand V. Avati <avati@amp.gluster.com>2009-03-12 16:29:45 +0530
commit7af8d8edbd8554235348e0f54348edf222c0b46e (patch)
tree21333449bf86e3481e8bc4197d17f69472398ef9 /xlators/debug
parent31c817836c9c56eca1441b3b6f8b83db41c67f94 (diff)
Add extra 'volume' parameter to inodelk/entrylk calls
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
Diffstat (limited to 'xlators/debug')
-rw-r--r--xlators/debug/error-gen/src/error-gen.c18
-rw-r--r--xlators/debug/trace/src/trace.c24
2 files changed, 22 insertions, 20 deletions
diff --git a/xlators/debug/error-gen/src/error-gen.c b/xlators/debug/error-gen/src/error-gen.c
index 2be30cb6c98..f013023a51b 100644
--- a/xlators/debug/error-gen/src/error-gen.c
+++ b/xlators/debug/error-gen/src/error-gen.c
@@ -1414,7 +1414,8 @@ error_gen_inodelk_cbk (call_frame_t *frame, void *cookie,
int32_t
error_gen_inodelk (call_frame_t *frame, xlator_t *this,
- loc_t *loc, int32_t cmd, struct flock *lock)
+ const char *volume, loc_t *loc, int32_t cmd,
+ struct flock *lock)
{
int op_errno = 0;
op_errno = error_gen(this);
@@ -1428,7 +1429,7 @@ error_gen_inodelk (call_frame_t *frame, xlator_t *this,
error_gen_inodelk_cbk,
FIRST_CHILD(this),
FIRST_CHILD(this)->fops->inodelk,
- loc, cmd, lock);
+ volume, loc, cmd, lock);
return 0;
}
@@ -1445,7 +1446,8 @@ error_gen_finodelk_cbk (call_frame_t *frame, void *cookie,
int32_t
error_gen_finodelk (call_frame_t *frame, xlator_t *this,
- fd_t *fd, int32_t cmd, struct flock *lock)
+ const char *volume, fd_t *fd, int32_t cmd,
+ struct flock *lock)
{
int op_errno = 0;
op_errno = error_gen(this);
@@ -1459,7 +1461,7 @@ error_gen_finodelk (call_frame_t *frame, xlator_t *this,
error_gen_finodelk_cbk,
FIRST_CHILD(this),
FIRST_CHILD(this)->fops->finodelk,
- fd, cmd, lock);
+ volume, fd, cmd, lock);
return 0;
}
@@ -1475,7 +1477,7 @@ error_gen_entrylk_cbk (call_frame_t *frame, void *cookie,
int32_t
error_gen_entrylk (call_frame_t *frame, xlator_t *this,
- loc_t *loc, const char *basename,
+ const char *volume, loc_t *loc, const char *basename,
entrylk_cmd cmd, entrylk_type type)
{
int op_errno = 0;
@@ -1489,7 +1491,7 @@ error_gen_entrylk (call_frame_t *frame, xlator_t *this,
STACK_WIND (frame, error_gen_entrylk_cbk,
FIRST_CHILD(this),
FIRST_CHILD(this)->fops->entrylk,
- loc, basename, cmd, type);
+ volume, loc, basename, cmd, type);
return 0;
}
@@ -1504,7 +1506,7 @@ error_gen_fentrylk_cbk (call_frame_t *frame, void *cookie,
int32_t
error_gen_fentrylk (call_frame_t *frame, xlator_t *this,
- fd_t *fd, const char *basename,
+ const char *volume, fd_t *fd, const char *basename,
entrylk_cmd cmd, entrylk_type type)
{
int op_errno = 0;
@@ -1518,7 +1520,7 @@ error_gen_fentrylk (call_frame_t *frame, xlator_t *this,
STACK_WIND (frame, error_gen_fentrylk_cbk,
FIRST_CHILD(this),
FIRST_CHILD(this)->fops->fentrylk,
- fd, basename, cmd, type);
+ volume, fd, basename, cmd, type);
return 0;
}
diff --git a/xlators/debug/trace/src/trace.c b/xlators/debug/trace/src/trace.c
index ac51b964432..f0f005a7cd3 100644
--- a/xlators/debug/trace/src/trace.c
+++ b/xlators/debug/trace/src/trace.c
@@ -1094,15 +1094,15 @@ trace_inodelk_cbk (call_frame_t *frame,
int32_t
trace_entrylk (call_frame_t *frame, xlator_t *this,
- loc_t *loc, const char *basename,
+ const char *volume, loc_t *loc, const char *basename,
entrylk_cmd cmd, entrylk_type type)
{
ERR_EINVAL_NORETURN (!this || !loc || !basename);
if (trace_fop_names[GF_FOP_ENTRYLK].enabled) {
gf_log (this->name, GF_LOG_NORMAL,
- "%"PRId64": (loc= {path=%s, ino=%"PRIu64"} basename=%s, cmd=%s, type=%s)",
- frame->root->unique, loc->path, loc->inode->ino, basename,
+ "%"PRId64": volume=%s, (loc= {path=%s, ino=%"PRIu64"} basename=%s, cmd=%s, type=%s)",
+ frame->root->unique, volume, loc->path, loc->inode->ino, basename,
((cmd == ENTRYLK_LOCK) ? "ENTRYLK_LOCK" : "ENTRYLK_UNLOCK"),
((type == ENTRYLK_RDLCK) ? "ENTRYLK_RDLCK" : "ENTRYLK_WRLCK"));
}
@@ -1111,21 +1111,21 @@ trace_entrylk (call_frame_t *frame, xlator_t *this,
trace_entrylk_cbk,
FIRST_CHILD (this),
FIRST_CHILD (this)->fops->entrylk,
- loc, basename, cmd, type);
+ volume, loc, basename, cmd, type);
return 0;
}
int32_t
trace_inodelk (call_frame_t *frame,
xlator_t *this,
- loc_t *loc, int32_t cmd, struct flock *flock)
+ const char *volume, loc_t *loc, int32_t cmd, struct flock *flock)
{
ERR_EINVAL_NORETURN (!this || !loc);
if (trace_fop_names[GF_FOP_INODELK].enabled) {
gf_log (this->name, GF_LOG_NORMAL,
- "%"PRId64": (loc {path=%s, ino=%"PRIu64"}, cmd=%s)",
- frame->root->unique, loc->path, loc->inode->ino,
+ "%"PRId64": volume=%s, (loc {path=%s, ino=%"PRIu64"}, cmd=%s)",
+ frame->root->unique, volume, loc->path, loc->inode->ino,
((cmd == F_SETLK)? "F_SETLK" : "unknown"));
}
@@ -1133,7 +1133,7 @@ trace_inodelk (call_frame_t *frame,
trace_inodelk_cbk,
FIRST_CHILD (this),
FIRST_CHILD (this)->fops->inodelk,
- loc, cmd, flock);
+ volume, loc, cmd, flock);
return 0;
}
@@ -1160,14 +1160,14 @@ trace_finodelk_cbk (call_frame_t *frame,
int32_t
trace_finodelk (call_frame_t *frame,
xlator_t *this,
- fd_t *fd, int32_t cmd, struct flock *flock)
+ const char *volume, fd_t *fd, int32_t cmd, struct flock *flock)
{
ERR_EINVAL_NORETURN (!this || !fd);
if (trace_fop_names[GF_FOP_FINODELK].enabled) {
gf_log (this->name, GF_LOG_NORMAL,
- "%"PRId64": (fd=%p, cmd=%s)",
- frame->root->unique, fd,
+ "%"PRId64": volume=%s, (fd=%p, cmd=%s)",
+ frame->root->unique, volume, fd,
((cmd == F_SETLK) ? "F_SETLK" : "unknown"));
}
@@ -1175,7 +1175,7 @@ trace_finodelk (call_frame_t *frame,
trace_finodelk_cbk,
FIRST_CHILD (this),
FIRST_CHILD (this)->fops->finodelk,
- fd, cmd, flock);
+ volume, fd, cmd, flock);
return 0;
}