* [Ocfs2-devel] [PATCH 3/5] Shift allocation ocfs2_live_connection to user_connect()
@ 2013-10-03 5:49 Goldwyn Rodrigues
2013-10-03 20:28 ` Andrew Morton
0 siblings, 1 reply; 2+ messages in thread
From: Goldwyn Rodrigues @ 2013-10-03 5:49 UTC (permalink / raw)
To: ocfs2-devel
We perform this because the DLM recovery callbacks will require
the ocfs2_live_connection structure to record the node information
when dlm_new_lockspace() is updated.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
fs/ocfs2/stack_user.c | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
index bf3e2fc..7869b90 100644
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
@@ -201,14 +201,9 @@ static struct ocfs2_live_connection *ocfs2_connection_find(const char *name)
* fill_super(), we can't get dupes here.
*/
static int ocfs2_live_connection_new(struct ocfs2_cluster_connection *conn,
- struct ocfs2_live_connection **c_ret)
+ struct ocfs2_live_connection *c)
{
int rc = 0;
- struct ocfs2_live_connection *c;
-
- c = kzalloc(sizeof(struct ocfs2_live_connection), GFP_KERNEL);
- if (!c)
- return -ENOMEM;
mutex_lock(&ocfs2_control_lock);
c->oc_conn = conn;
@@ -222,12 +217,6 @@ static int ocfs2_live_connection_new(struct ocfs2_cluster_connection *conn,
}
mutex_unlock(&ocfs2_control_lock);
-
- if (!rc)
- *c_ret = c;
- else
- kfree(c);
-
return rc;
}
@@ -842,12 +831,18 @@ const struct dlm_lockspace_ops ocfs2_ls_ops = {
static int user_cluster_connect(struct ocfs2_cluster_connection *conn)
{
dlm_lockspace_t *fsdlm;
- struct ocfs2_live_connection *uninitialized_var(control);
+ struct ocfs2_live_connection *lc = NULL;
int rc = 0;
BUG_ON(conn == NULL);
- rc = ocfs2_live_connection_new(conn, &control);
+ lc = kzalloc(sizeof(struct ocfs2_live_connection), GFP_KERNEL);
+ if (!lc) {
+ rc = -ENOMEM;
+ goto out;
+ }
+
+ rc = ocfs2_live_connection_new(conn, lc);
if (rc)
goto out;
@@ -863,20 +858,24 @@ static int user_cluster_connect(struct ocfs2_cluster_connection *conn)
conn->cc_version.pv_major, conn->cc_version.pv_minor,
running_proto.pv_major, running_proto.pv_minor);
rc = -EPROTO;
- ocfs2_live_connection_drop(control);
+ ocfs2_live_connection_drop(lc);
+ lc = NULL;
goto out;
}
rc = dlm_new_lockspace(conn->cc_name, NULL, DLM_LSFL_FS, DLM_LVB_LEN,
NULL, NULL, NULL, &fsdlm);
if (rc) {
- ocfs2_live_connection_drop(control);
+ ocfs2_live_connection_drop(lc);
+ lc = NULL;
goto out;
}
- conn->cc_private = control;
+ conn->cc_private = lc;
conn->cc_lockspace = fsdlm;
out:
+ if (rc && lc)
+ kfree(lc);
return rc;
}
--
1.8.1.4
--
Goldwyn
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Ocfs2-devel] [PATCH 3/5] Shift allocation ocfs2_live_connection to user_connect()
2013-10-03 5:49 [Ocfs2-devel] [PATCH 3/5] Shift allocation ocfs2_live_connection to user_connect() Goldwyn Rodrigues
@ 2013-10-03 20:28 ` Andrew Morton
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2013-10-03 20:28 UTC (permalink / raw)
To: ocfs2-devel
On Thu, 3 Oct 2013 00:49:59 -0500 Goldwyn Rodrigues <rgoldwyn@suse.de> wrote:
> We perform this because the DLM recovery callbacks will require
> the ocfs2_live_connection structure to record the node information
> when dlm_new_lockspace() is updated.
>
> ...
>
> static int user_cluster_connect(struct ocfs2_cluster_connection *conn)
> {
> dlm_lockspace_t *fsdlm;
> - struct ocfs2_live_connection *uninitialized_var(control);
> + struct ocfs2_live_connection *lc = NULL;
> int rc = 0;
Neither of the above initializations are needed. Presumably trhe
compiler will jsut remove the code, but it's a bit strange.
> BUG_ON(conn == NULL);
>
> - rc = ocfs2_live_connection_new(conn, &control);
> + lc = kzalloc(sizeof(struct ocfs2_live_connection), GFP_KERNEL);
> + if (!lc) {
> + rc = -ENOMEM;
> + goto out;
> + }
> +
> + rc = ocfs2_live_connection_new(conn, lc);
> if (rc)
> goto out;
> ...
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-03 20:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-03 5:49 [Ocfs2-devel] [PATCH 3/5] Shift allocation ocfs2_live_connection to user_connect() Goldwyn Rodrigues
2013-10-03 20:28 ` Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.