From patchwork Fri Dec 15 17:42:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 10115721 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4AD386019C for ; Fri, 15 Dec 2017 17:47:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38EBF29EE1 for ; Fri, 15 Dec 2017 17:47:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D1372A024; Fri, 15 Dec 2017 17:47:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4A2C29EE1 for ; Fri, 15 Dec 2017 17:47:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755684AbdLORrV (ORCPT ); Fri, 15 Dec 2017 12:47:21 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:39274 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756139AbdLORrB (ORCPT ); Fri, 15 Dec 2017 12:47:01 -0500 Received: by mail-pg0-f65.google.com with SMTP id w7so6253082pgv.6; Fri, 15 Dec 2017 09:47:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U52mHojhwBacR14yIG4chxjf3lzAO/aMC3pCmnAt1FQ=; b=Tavc5tMmqAkOu4nRJHNeIBgsWt1intlAzgijPfrAZTifwSuP+5Z4TgzFg/tWTnXjZh vJTfJe5UH1d+fzSDnNlT3ggAWza5TiDxUHeTTjPycJW8wcQSHUV6KTVQGczxOn0BlaAQ Dv7pwi98Vkx4uPdWrwL5CW9dpsjk6I0kLr4Bs58hakyF8RS2zFWQ1zijUT1zcpyP7TNJ be1Q46jZQfeKHhyB3wmO/NtOvTrPuO3bDvasjC/4P/U9SIXbI4v5rf5QutrnUKjbFZun DQyrs5m8lbehfAYYCZ3I2EGA/8I18zzPOi0yLubIvPszWmsEuWC6zz7oTg+pJKkdHA/8 Iz6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U52mHojhwBacR14yIG4chxjf3lzAO/aMC3pCmnAt1FQ=; b=izVZ3Yb1uUhodZz3B8cUZhGH38TBnKqNKjANMwvzbq92jv+ggi0Nu/sfLBNbHSXQOr ZR7+62rYfylLFpur0RlRHD14R4d8bgYcvvZ9UBCyCJ53iES/S+XmPY5o4BxehRH5qtn1 gg9OnR7Xq+J+PgcowertpvqTGhYy6ovWtXAUNK7cx4zmxKuO/itMFd9VsiVEtPhbfjNL ceCQAEaAQpOtumxm3VbJ9JFJc58S6MNaNMqdY0FoMvblqR/GswDZih0qa7UdhpCB1F1s FVFzhGFznJf09JnOY7FIZn+fDB7k/rha2zHWyN26Z6krddzMD0+OlaGb0MNIjEZWb3oE eLJw== X-Gm-Message-State: AKGB3mIi1NPZIW8sgGJ1WtaYpqPi902IEI5d2qZHBIncQyViTL+2jAVL 9/hDvrkilV+q8qfKpPPC7/X9aAkWeK0= X-Google-Smtp-Source: ACJfBosuPAyqFfHyyCnafsQ2XLW49b6bZw1AlA77oGUYii9hiX+BXaPq0D7Y06Tl6PX3OX0qCewx9A== X-Received: by 10.84.217.14 with SMTP id o14mr7314373pli.169.1513360020428; Fri, 15 Dec 2017 09:47:00 -0800 (PST) Received: from zzz.localdomain (c-67-185-97-198.hsd1.wa.comcast.net. [67.185.97.198]) by smtp.gmail.com with ESMTPSA id j62sm12980149pfc.18.2017.12.15.09.46.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 09:46:59 -0800 (PST) From: Eric Biggers To: linux-fscrypt@vger.kernel.org Cc: "Theodore Y . Ts'o" , Jaegeuk Kim , linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, Eric Biggers Subject: [PATCH 20/24] fscrypt: move fscrypt_symlink_data to fscrypt_private.h Date: Fri, 15 Dec 2017 09:42:21 -0800 Message-Id: <20171215174225.31583-21-ebiggers3@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171215174225.31583-1-ebiggers3@gmail.com> References: <20171215174225.31583-1-ebiggers3@gmail.com> Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers Now that all filesystems have been converted to use the symlink helper functions, they no longer need the declaration of 'struct fscrypt_symlink_data'. Move it from fscrypt.h to fscrypt_private.h. Signed-off-by: Eric Biggers --- fs/crypto/fscrypt_private.h | 9 +++++++++ include/linux/fscrypt.h | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h index 6995bca5006b..cec9ce309f41 100644 --- a/fs/crypto/fscrypt_private.h +++ b/fs/crypto/fscrypt_private.h @@ -50,6 +50,15 @@ struct fscrypt_context { #define FS_ENCRYPTION_CONTEXT_FORMAT_V1 1 +/** + * For encrypted symlinks, the ciphertext length is stored at the beginning + * of the string in little-endian format. + */ +struct fscrypt_symlink_data { + __le16 len; + char encrypted_path[1]; +} __packed; + /* * A pointer to this structure is stored in the file system's in-core * representation of an inode. diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 6a678d0e956a..952ab97af325 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -21,15 +21,6 @@ struct fscrypt_ctx; struct fscrypt_info; -/** - * For encrypted symlinks, the ciphertext length is stored at the beginning - * of the string in little-endian format. - */ -struct fscrypt_symlink_data { - __le16 len; - char encrypted_path[1]; -} __packed; - struct fscrypt_str { unsigned char *name; u32 len;