From patchwork Thu Apr 23 08:56:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chanho Park X-Patchwork-Id: 463916 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F32441400B7 for ; Thu, 23 Apr 2015 18:58:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=bXeY7Vdz; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753903AbbDWI5E (ORCPT ); Thu, 23 Apr 2015 04:57:04 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:33360 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750958AbbDWI5B (ORCPT ); Thu, 23 Apr 2015 04:57:01 -0400 Received: by paboj16 with SMTP id oj16so12842480pab.0; Thu, 23 Apr 2015 01:57:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=E0D+JHpXpuhftfiLkVIg48dQrYFt10LrC7aICnvk3uU=; b=bXeY7VdzhZY2i7IA40Q3UAao7I4N7S8MT4eXUVrcBimRgvrAyYgZOfBGDdXL+iYGjE 4qLB62IwSgFoPf07EMHSZnbSV2BGwdFmmBlfNoCoxDR+GDph+sXMUIVR54HEw4bzONOb ah5Hyofluldx/VPic0TWBMxDM6ffiTJiaV0QSMORKPIo7RWelUM87aY36D7thYKeH4ad znRbA8Qs8mevNvxkiD6b1vyeTyPxp0dy45QBH4TW0vuD8v3vcuh7eP7fcz9HxdnJgfSX 0MwFme7O75XshUzlZKTA/+qPEiLJ3jOAUcsevmHHc5yntFZry0dgydJS5UJ3s2822GDe 7H/A== X-Received: by 10.70.33.67 with SMTP id p3mr3363071pdi.126.1429779420517; Thu, 23 Apr 2015 01:57:00 -0700 (PDT) Received: from localhost.localdomain ([211.189.127.168]) by mx.google.com with ESMTPSA id l8sm7405323pdj.80.2015.04.23.01.56.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Apr 2015 01:56:59 -0700 (PDT) From: Chanho Park X-Google-Original-From: Chanho Park To: tytso@mit.edu, linux-ext4@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Chanho Park , Michael Halcrow , Andreas Dilger Subject: [PATCH] ext4 crypto: remove duplicated encryption mode definitions Date: Thu, 23 Apr 2015 17:56:16 +0900 Message-Id: <1429779376-26355-1-git-send-email-chanho61.park@samsung.com> X-Mailer: git-send-email 1.9.1 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org This patch removes duplicated encryption modes which were already in ext4.h. They were duplicated from commit 3edc18d and commit f542fb. Cc: Theodore Ts'o Cc: Michael Halcrow Cc: Andreas Dilger Signed-off-by: Chanho Park --- fs/ext4/ext4.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index ef267ad..07378a4 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1066,12 +1066,6 @@ extern void ext4_set_bits(void *bm, int cur, int len); /* Metadata checksum algorithm codes */ #define EXT4_CRC32C_CHKSUM 1 -/* Encryption algorithms */ -#define EXT4_ENCRYPTION_MODE_INVALID 0 -#define EXT4_ENCRYPTION_MODE_AES_256_XTS 1 -#define EXT4_ENCRYPTION_MODE_AES_256_GCM 2 -#define EXT4_ENCRYPTION_MODE_AES_256_CBC 3 - /* * Structure of the super block */