Subject: [merged] ocfs2-remove-unused-variable-uuid_net_key-in-ocfs2_initialize_super.patch removed from -mm tree To: xuejiufei@xxxxxxxxxx,jlbec@xxxxxxxxxxxx,joseph.qi@xxxxxxxxxx,mfasheh@xxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 04 Apr 2014 12:30:01 -0700 The patch titled Subject: ocfs2: remove unused variable uuid_net_key in ocfs2_initialize_super has been removed from the -mm tree. Its filename was ocfs2-remove-unused-variable-uuid_net_key-in-ocfs2_initialize_super.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: joyce.xue <xuejiufei@xxxxxxxxxx> Subject: 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@xxxxxxxxxx> Signed-off-by: Joseph Qi <joseph.qi@xxxxxxxxxx> Acked-by: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/super.c | 3 --- 1 file changed, 3 deletions(-) diff -puN fs/ocfs2/super.c~ocfs2-remove-unused-variable-uuid_net_key-in-ocfs2_initialize_super fs/ocfs2/super.c --- a/fs/ocfs2/super.c~ocfs2-remove-unused-variable-uuid_net_key-in-ocfs2_initialize_super +++ a/fs/ocfs2/super.c @@ -2072,7 +2072,6 @@ static int ocfs2_initialize_super(struct struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data; struct inode *inode = NULL; struct ocfs2_journal *journal; - __le32 uuid_net_key; struct ocfs2_super *osb; u64 total_blocks; @@ -2306,8 +2305,6 @@ static int ocfs2_initialize_super(struct goto bail; } - memcpy(&uuid_net_key, di->id2.i_super.s_uuid, sizeof(uuid_net_key)); - strncpy(osb->vol_label, di->id2.i_super.s_label, 63); osb->vol_label[63] = '\0'; osb->root_blkno = le64_to_cpu(di->id2.i_super.s_root_blkno); _ Patches currently in -mm which might be from xuejiufei@xxxxxxxxxx are origin.patch ocfs2-do-not-return-dlm_migrate_response_mastery_ref-to-avoid-endlessloop-during-umount.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html