summaryrefslogtreecommitdiffstats
path: root/xlators/performance
diff options
context:
space:
mode:
authorRaghavendra G <raghavendra@gluster.com>2009-12-02 01:00:44 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-12-02 01:36:43 -0800
commit90328b827768552a05bb12abf62d09c9566309d1 (patch)
tree0f1c3e31a8ec550245bd06eeb82e30a5fea9261a /xlators/performance
parent67d6a0a6195a72bce251891fccbd38929d5586dc (diff)
performance/stat-prefetch: fix access to inode table.
- Access the inode table from one of fd->inode->table, inode->table or parent->table instead of from root xlators itable. Signed-off-by: Raghavendra G <raghavendra@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 369 (Samba does not work with booster.) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=369
Diffstat (limited to 'xlators/performance')
-rw-r--r--xlators/performance/stat-prefetch/src/stat-prefetch.c36
1 files changed, 23 insertions, 13 deletions
diff --git a/xlators/performance/stat-prefetch/src/stat-prefetch.c b/xlators/performance/stat-prefetch/src/stat-prefetch.c
index bf328bb77f2..da398d23a0f 100644
--- a/xlators/performance/stat-prefetch/src/stat-prefetch.c
+++ b/xlators/performance/stat-prefetch/src/stat-prefetch.c
@@ -733,7 +733,8 @@ out:
int32_t
-sp_cache_remove_parent_entry (call_frame_t *frame, xlator_t *this, char *path)
+sp_cache_remove_parent_entry (call_frame_t *frame, xlator_t *this,
+ inode_table_t *itable, char *path)
{
char *parent = NULL, *grand_parent = NULL, *cpy = NULL;
inode_t *inode_gp = NULL;
@@ -747,8 +748,7 @@ sp_cache_remove_parent_entry (call_frame_t *frame, xlator_t *this, char *path)
}
if (grand_parent && strcmp (grand_parent, "/")) {
- inode_gp = inode_from_path (frame->root->frames.this->itable,
- grand_parent);
+ inode_gp = inode_from_path (itable, grand_parent);
if (inode_gp) {
cache_gp = sp_get_cache_inode (this, inode_gp,
frame->root->pid);
@@ -1124,7 +1124,8 @@ sp_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
goto unwind;
}
- ret = sp_cache_remove_parent_entry (frame, this, path);
+ ret = sp_cache_remove_parent_entry (frame, this, fd->inode->table,
+ path);
FREE (path);
@@ -1399,7 +1400,8 @@ sp_create (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc->inode, out,
op_errno, EINVAL);
- ret = sp_cache_remove_parent_entry (frame, this, (char *)loc->path);
+ ret = sp_cache_remove_parent_entry (frame, this, loc->inode->table,
+ (char *)loc->path);
if (ret == -1) {
op_errno = ENOMEM;
gf_log (this->name, GF_LOG_ERROR, "out of memory");
@@ -1627,7 +1629,8 @@ sp_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode)
GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc->inode, out,
op_errno, EINVAL);
- ret = sp_cache_remove_parent_entry (frame, this, (char *)loc->path);
+ ret = sp_cache_remove_parent_entry (frame, this, loc->inode->table,
+ (char *)loc->path);
if (ret == -1) {
op_errno = ENOMEM;
gf_log (this->name, GF_LOG_ERROR, "out of memory");
@@ -1726,7 +1729,8 @@ sp_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc->inode, out,
op_errno, EINVAL);
- ret = sp_cache_remove_parent_entry (frame, this, (char *)loc->path);
+ ret = sp_cache_remove_parent_entry (frame, this, loc->inode->table,
+ (char *)loc->path);
if (ret == -1) {
op_errno = ENOMEM;
gf_log (this->name, GF_LOG_ERROR, "out of memory");
@@ -1824,7 +1828,8 @@ sp_symlink (call_frame_t *frame, xlator_t *this, const char *linkpath,
GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc->inode, out,
op_errno, EINVAL);
- ret = sp_cache_remove_parent_entry (frame, this, (char *)loc->path);
+ ret = sp_cache_remove_parent_entry (frame, this, loc->inode->table,
+ (char *)loc->path);
if (ret == -1) {
op_errno = ENOMEM;
gf_log (this->name, GF_LOG_ERROR, "out of memory");
@@ -1922,7 +1927,8 @@ sp_link (call_frame_t *frame, xlator_t *this, loc_t *oldloc, loc_t *newloc)
GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, oldloc->name, out,
op_errno, EINVAL);
- ret = sp_cache_remove_parent_entry (frame, this, (char *)newloc->path);
+ ret = sp_cache_remove_parent_entry (frame, this, newloc->parent->table,
+ (char *)newloc->path);
if (ret == -1) {
op_errno = ENOMEM;
gf_log (this->name, GF_LOG_ERROR, "out of memory");
@@ -2373,7 +2379,8 @@ sp_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc)
sp_cache_unref (cache);
}
- ret = sp_cache_remove_parent_entry (frame, this, (char *)loc->path);
+ ret = sp_cache_remove_parent_entry (frame, this, loc->parent->table,
+ (char *)loc->path);
if (ret == -1) {
op_errno = ENOMEM;
gf_log (this->name, GF_LOG_ERROR, "out of memory");
@@ -2493,7 +2500,8 @@ sp_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc)
sp_cache_unref (cache);
}
- ret = sp_cache_remove_parent_entry (frame, this, (char *)loc->path);
+ ret = sp_cache_remove_parent_entry (frame, this, loc->inode->table,
+ (char *)loc->path);
if (ret == -1) {
op_errno = ENOMEM;
gf_log (this->name, GF_LOG_ERROR, "out of memory");
@@ -2781,13 +2789,15 @@ sp_rename (call_frame_t *frame, xlator_t *this, loc_t *oldloc,loc_t *newloc)
sp_cache_unref (cache);
}
- ret = sp_cache_remove_parent_entry (frame, this, (char *)oldloc->path);
+ ret = sp_cache_remove_parent_entry (frame, this, oldloc->parent->table,
+ (char *)oldloc->path);
if (ret == -1) {
gf_log (this->name, GF_LOG_ERROR, "out of memory");
goto out;
}
- ret = sp_cache_remove_parent_entry (frame, this, (char *)newloc->path);
+ ret = sp_cache_remove_parent_entry (frame, this, newloc->parent->table,
+ (char *)newloc->path);
if (ret == -1) {
gf_log (this->name, GF_LOG_ERROR, "out of memory");
goto out;