diff options
author | Mohit Agrawal <moagrawa@redhat.com> | 2018-05-23 09:10:11 +0530 |
---|---|---|
committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-05-25 02:05:37 +0000 |
commit | b679fd4b73d9ec039029088769722887b61d750a (patch) | |
tree | 1fba7b4d16dea3ffa8808475d5d5cb44a3256bd1 /xlators/storage/posix/src/posix-inode-fd-ops.c | |
parent | 7b95d5a4b3988757bf8c91f82dcaf86ed3da6875 (diff) |
Revert "glusterfsd: Memleak in glusterfsd process while brick mux is on"
Updates: bz#1582286
This reverts commit 7c3cc485054e4ede1efb358552135b432fb7047a.
Change-Id: I831d646112bcfa13d0c2153482ad00ff1b23aa6c
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Diffstat (limited to 'xlators/storage/posix/src/posix-inode-fd-ops.c')
-rw-r--r-- | xlators/storage/posix/src/posix-inode-fd-ops.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/xlators/storage/posix/src/posix-inode-fd-ops.c b/xlators/storage/posix/src/posix-inode-fd-ops.c index 2e5b7c5772a..bf7e87dc91b 100644 --- a/xlators/storage/posix/src/posix-inode-fd-ops.c +++ b/xlators/storage/posix/src/posix-inode-fd-ops.c @@ -1200,8 +1200,6 @@ posix_releasedir (xlator_t *this, } priv = this->private; - if (!priv) - goto out; pthread_mutex_lock (&priv->janitor_lock); { @@ -2004,8 +2002,6 @@ posix_release (xlator_t *this, fd_t *fd) "pfd->dir is %p (not NULL) for file fd=%p", pfd->dir, fd); } - if (!priv) - goto out; pthread_mutex_lock (&priv->janitor_lock); { @@ -2200,7 +2196,6 @@ posix_setxattr (call_frame_t *frame, xlator_t *this, VALIDATE_OR_GOTO (frame, out); VALIDATE_OR_GOTO (this, out); - VALIDATE_OR_GOTO (this->private, out); VALIDATE_OR_GOTO (loc, out); VALIDATE_OR_GOTO (dict, out); @@ -2903,7 +2898,6 @@ posix_getxattr (call_frame_t *frame, xlator_t *this, VALIDATE_OR_GOTO (frame, out); VALIDATE_OR_GOTO (this, out); VALIDATE_OR_GOTO (loc, out); - VALIDATE_OR_GOTO (this->private, out); SET_FS_ID (frame->root->uid, frame->root->gid); MAKE_INODE_HANDLE (real_path, this, loc, NULL); @@ -3031,12 +3025,11 @@ posix_getxattr (call_frame_t *frame, xlator_t *this, goto done; } if (loc->inode && name && (XATTR_IS_PATHINFO (name))) { - VALIDATE_OR_GOTO (this->private, out); - if (LOC_HAS_ABSPATH (loc)) { + if (LOC_HAS_ABSPATH (loc)) MAKE_REAL_PATH (rpath, this, loc->path); - } else { + else rpath = real_path; - } + size = gf_asprintf (&host_buf, "<POSIX(%s):%s:%s>", priv->base_path, ((priv->node_uuid_pathinfo && @@ -5356,8 +5349,6 @@ posix_forget (xlator_t *this, inode_t *inode) struct posix_private *priv_posix = NULL; priv_posix = (struct posix_private *) this->private; - if (!priv_posix) - return 0; ret = inode_ctx_del (inode, this, &ctx_uint); if (!ctx_uint) |