The branch, master has been updated
via f27ba17 vfs_glusterfs: Fix a memory leak in AIO
from 55d8bfc s3:libsmb: remove unused spnego related includes
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f27ba17fcf1cf6a8559ef7d77c08efe648fd49e5
Author: Jose A. Rivera <[email protected]>
Date: Thu Dec 17 08:19:22 2015 -0600
vfs_glusterfs: Fix a memory leak in AIO
Signed-off-by: Jose A. Rivera <[email protected]>
Reviewed-by: Ira Cooper <[email protected]>
Autobuild-User(master): Ira Cooper <[email protected]>
Autobuild-Date(master): Thu Dec 17 20:55:22 CET 2015 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_glusterfs.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index e0cf719..f32f598 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -577,18 +577,14 @@ static void aio_tevent_fd_done(struct tevent_context
*event_ctx,
DEBUG(0,("\nRead from pipe failed (%s)", strerror(errno)));
}
- if (state->cancelled) {
- return;
- }
-
- req = state->req;
-
/* if we've cancelled the op, there is no req, so just clean up. */
if (state->cancelled == true) {
TALLOC_FREE(state);
return;
}
+ req = state->req;
+
if (req) {
tevent_req_done(req);
}
--
Samba Shared Repository
