From 5868accc71e15e27aef6fb74036a3f1f439200b8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 14 May 2013 15:43:10 +0200 Subject: [PATCH] vfs_gpfs: slightly simplify connect() DISCONNECT can be arbitrarily complex, TALLOC_FREE of a simple struct is easier. Signed-off-by: Volker Lendecke Reviewed-by: Christian Ambach Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Tue May 14 18:11:29 CEST 2013 on sn-devel-104 --- source3/modules/vfs_gpfs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 7f00eac5f68..13061c8c359 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -1691,19 +1691,19 @@ static int vfs_gpfs_connect(struct vfs_handle_struct *handle, smbd_gpfs_lib_init(); - ret = SMB_VFS_NEXT_CONNECT(handle, service, user); - - if (ret < 0) { - return ret; - } - config = talloc_zero(handle->conn, struct gpfs_config_data); if (!config) { - SMB_VFS_NEXT_DISCONNECT(handle); DEBUG(0, ("talloc_zero() failed\n")); + errno = ENOMEM; return -1; } + ret = SMB_VFS_NEXT_CONNECT(handle, service, user); + if (ret < 0) { + TALLOC_FREE(config); + return ret; + } + config->sharemodes = lp_parm_bool(SNUM(handle->conn), "gpfs", "sharemodes", true); -- 2.11.4.GIT