aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorjoyce.xue <xuejiufei@huawei.com>2014-04-03 17:46:47 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 19:20:53 -0400
commita75fe48cad2fb81e0e2671c73aea6c78ce5626d4 (patch)
tree3e6f5b0773fe5ea8a862c9d238639da00db42966 /fs
parentc18ceab01240fd4c354b78d877571b729908e4a3 (diff)
ocfs2: remove unused variable uuid_net_key in ocfs2_initialize_super
Variable uuid_net_key in ocfs2_initialize_super() is not used. Clean it up. Signed-off-by: joyce.xue <xuejiufei@huawei.com> Signed-off-by: Joseph Qi <joseph.qi@huawei.com> Acked-by: Mark Fasheh <mfasheh@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/super.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index d17145552097..d7190b2cfd40 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -2072,7 +2072,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
2072 struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data; 2072 struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data;
2073 struct inode *inode = NULL; 2073 struct inode *inode = NULL;
2074 struct ocfs2_journal *journal; 2074 struct ocfs2_journal *journal;
2075 __le32 uuid_net_key;
2076 struct ocfs2_super *osb; 2075 struct ocfs2_super *osb;
2077 u64 total_blocks; 2076 u64 total_blocks;
2078 2077
@@ -2306,8 +2305,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
2306 goto bail; 2305 goto bail;
2307 } 2306 }
2308 2307
2309 memcpy(&uuid_net_key, di->id2.i_super.s_uuid, sizeof(uuid_net_key));
2310
2311 strncpy(osb->vol_label, di->id2.i_super.s_label, 63); 2308 strncpy(osb->vol_label, di->id2.i_super.s_label, 63);
2312 osb->vol_label[63] = '\0'; 2309 osb->vol_label[63] = '\0';
2313 osb->root_blkno = le64_to_cpu(di->id2.i_super.s_root_blkno); 2310 osb->root_blkno = le64_to_cpu(di->id2.i_super.s_root_blkno);