- patches.fixes/ocfs2-Fix-refcnt-leak-on-ocfs2_fast_follow_link-erro.patch:
[opensuse:kernel-source.git] / patches.fixes / ocfs2-fix-a-misleading-variable-name.patch
1 From: Wengang Wang <wen.gang.wang@oracle.com>
2 Date: Fri, 22 Jan 2010 21:58:04 +0800
3 Subject: ocfs2: fix a misleading variable name
4 Patch-mainline: 2.6.33
5
6 a local variable "dlm_version" is used as a fs locking version.
7 rename it fs_version.
8
9 Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
10 Signed-off-by: Joel Becker <joel.becker@oracle.com>
11 Signed-off-by: Mark Fasheh <mfasheh@suse.com>
12 ---
13  fs/ocfs2/stack_o2cb.c |   12 ++++++------
14  1 files changed, 6 insertions(+), 6 deletions(-)
15
16 diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c
17 index e49c410..3038c92 100644
18 --- a/fs/ocfs2/stack_o2cb.c
19 +++ b/fs/ocfs2/stack_o2cb.c
20 @@ -277,7 +277,7 @@ static int o2cb_cluster_connect(struct ocfs2_cluster_connection *conn)
21         u32 dlm_key;
22         struct dlm_ctxt *dlm;
23         struct o2dlm_private *priv;
24 -       struct dlm_protocol_version dlm_version;
25 +       struct dlm_protocol_version fs_version;
26  
27         BUG_ON(conn == NULL);
28         BUG_ON(o2cb_stack.sp_proto == NULL);
29 @@ -304,18 +304,18 @@ static int o2cb_cluster_connect(struct ocfs2_cluster_connection *conn)
30         /* used by the dlm code to make message headers unique, each
31          * node in this domain must agree on this. */
32         dlm_key = crc32_le(0, conn->cc_name, conn->cc_namelen);
33 -       dlm_version.pv_major = conn->cc_version.pv_major;
34 -       dlm_version.pv_minor = conn->cc_version.pv_minor;
35 +       fs_version.pv_major = conn->cc_version.pv_major;
36 +       fs_version.pv_minor = conn->cc_version.pv_minor;
37  
38 -       dlm = dlm_register_domain(conn->cc_name, dlm_key, &dlm_version);
39 +       dlm = dlm_register_domain(conn->cc_name, dlm_key, &fs_version);
40         if (IS_ERR(dlm)) {
41                 rc = PTR_ERR(dlm);
42                 mlog_errno(rc);
43                 goto out_free;
44         }
45  
46 -       conn->cc_version.pv_major = dlm_version.pv_major;
47 -       conn->cc_version.pv_minor = dlm_version.pv_minor;
48 +       conn->cc_version.pv_major = fs_version.pv_major;
49 +       conn->cc_version.pv_minor = fs_version.pv_minor;
50         conn->cc_lockspace = dlm;
51  
52         dlm_register_eviction_cb(dlm, &priv->op_eviction_cb);
53 -- 
54 1.6.4.2
55