{"id":816544,"url":"http://patchwork.ozlabs.org/api/patches/816544/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20170920224605.22030-4-ebiggers3@gmail.com/","project":{"id":8,"url":"http://patchwork.ozlabs.org/api/projects/8/?format=json","name":"Linux ext4 filesystem development","link_name":"linux-ext4","list_id":"linux-ext4.vger.kernel.org","list_email":"linux-ext4@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170920224605.22030-4-ebiggers3@gmail.com>","list_archive_url":null,"date":"2017-09-20T22:45:43","name":"[03/25] fscrypt: remove ->is_encrypted()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"0e0fdde9302998086b39371d0b3237388c7d69e9","submitter":{"id":65202,"url":"http://patchwork.ozlabs.org/api/people/65202/?format=json","name":"Eric Biggers","email":"ebiggers3@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20170920224605.22030-4-ebiggers3@gmail.com/mbox/","series":[{"id":4249,"url":"http://patchwork.ozlabs.org/api/series/4249/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/list/?series=4249","date":"2017-09-20T22:45:40","name":"fscrypt: add some higher-level helper functions","version":1,"mbox":"http://patchwork.ozlabs.org/series/4249/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816544/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816544/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-ext4-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"OM7b/Bbh\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyFHB2VnJz9sRV\n\tfor ;\n\tThu, 21 Sep 2017 08:47:02 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751912AbdITWrA (ORCPT );\n\tWed, 20 Sep 2017 18:47:00 -0400","from mail-pf0-f194.google.com ([209.85.192.194]:36333 \"EHLO\n\tmail-pf0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751872AbdITWqz (ORCPT\n\t); Wed, 20 Sep 2017 18:46:55 -0400","by mail-pf0-f194.google.com with SMTP id f84so1721500pfj.3;\n\tWed, 20 Sep 2017 15:46:54 -0700 (PDT)","from ebiggers-linuxstation.kir.corp.google.com ([100.66.174.81])\n\tby smtp.gmail.com with ESMTPSA id j2sm6249pgn.26.2017.09.20.15.46.53\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 20 Sep 2017 15:46:53 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=gcD1SEZKaP7ASsDGPEZZpHxv8JDUnE78aLD8qw/bV64=;\n\tb=OM7b/BbhGfwnnyoKhW7USH+8q8KnDEH01igCtVtnQLpWx9LGRrXdFto4QayeMmsLra\n\tocVfUtRTVX8h3jOMl6VZjGVIYNOELAhWFI/vcNWOJXHrE3+eVxu8sY/7OZKFeTYECjyb\n\trkavdVFMIYd1yqn3Pv+gfdpNvvoaY9y1mrLkHksFK0wW83Ad9Zrv9WJvi+v9rj7y8iMW\n\t4B/chhZ7UfrD6nTC/GKTJkBiZI6FULrd9DiuyBDwYfFArA+MOUq3Tqb1ibNOruK8WCBa\n\teW72Q18OSXhT/Rbl0HO6ncr7/qxCczKRauMzVr54xanQjWJN55CY3mNhwPBWVBt0P5jv\n\t4rRA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=gcD1SEZKaP7ASsDGPEZZpHxv8JDUnE78aLD8qw/bV64=;\n\tb=Cc8povKN8wmHwJw5jfo8AZnndRKFaHwgLItW+iUW1TYcuMIUY4azWv8w0G86KVV/cH\n\tOPhjN6DXIUxWDhoJmsO1CTcg9DUClSwU0JKRjPa/VdE7fWBnyPzo76bl7d14ackkf8YU\n\tbJWtFpEzwtifMvQQcvp5divcuKU2HfFaZAjuRmKPHlCDkp2D13Xyn1Lw5wx+8YgaG/nf\n\tGP5b8GJtNOkYIc+PnupJ5LA2wAi4bJlT/8JzpHROarqBgKxpJBsOI/bKQXTuCsUI7jh/\n\tp+TXw5Z25bJruaaKAeHrpdAaP1zV0Lh+rvBq7FRLPlk6uy1bIf2kYPwDYzyZe2QdDPtZ\n\tKWUQ==","X-Gm-Message-State":"AHPjjUgT9qdHZq/XvLqwvx0EDhJsFyYD3TrOe9eOAviQaRv8KBBWe1Mr\n\t/ybZmm9jf67Z45wAiGuwkM4NIpy9ob8=","X-Google-Smtp-Source":"AOwi7QBYjjrKmxM6QNAIpjx6GNlQuL6iMi/kXgS5IHhAk9VBe5d+dzIHu2hshfMKrky0LHJMG9CdzQ==","X-Received":"by 10.99.49.205 with SMTP id x196mr3724290pgx.121.1505947614418; \n\tWed, 20 Sep 2017 15:46:54 -0700 (PDT)","From":"Eric Biggers ","To":"linux-fscrypt@vger.kernel.org","Cc":"linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,\n\tlinux-f2fs-devel@lists.sourceforge.net,\n\tlinux-mtd@lists.infradead.org, \"Theodore Y . Ts'o\" ,\n\tJaegeuk Kim , Michael Halcrow ,\n\tEric Biggers ","Subject":"[PATCH 03/25] fscrypt: remove ->is_encrypted()","Date":"Wed, 20 Sep 2017 15:45:43 -0700","Message-Id":"<20170920224605.22030-4-ebiggers3@gmail.com>","X-Mailer":"git-send-email 2.14.1.821.g8fa685d3b7-goog","In-Reply-To":"<20170920224605.22030-1-ebiggers3@gmail.com>","References":"<20170920224605.22030-1-ebiggers3@gmail.com>","Sender":"linux-ext4-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-ext4@vger.kernel.org"},"content":"From: Eric Biggers \n\nNow that all callers of fscrypt_operations.is_encrypted() have been\nswitched to IS_ENCRYPTED(), remove ->is_encrypted().\n\nSigned-off-by: Eric Biggers \n---\n fs/ext4/super.c | 2 --\n fs/f2fs/super.c | 2 --\n fs/ubifs/crypto.c | 1 -\n fs/ubifs/super.c | 1 -\n fs/ubifs/ubifs.h | 9 ++-------\n include/linux/fscrypt_common.h | 1 -\n 6 files changed, 2 insertions(+), 14 deletions(-)","diff":"diff --git a/fs/ext4/super.c b/fs/ext4/super.c\nindex dcfb19539871..bc63cdf194e3 100644\n--- a/fs/ext4/super.c\n+++ b/fs/ext4/super.c\n@@ -1241,13 +1241,11 @@ static const struct fscrypt_operations ext4_cryptops = {\n \t.get_context\t\t= ext4_get_context,\n \t.set_context\t\t= ext4_set_context,\n \t.dummy_context\t\t= ext4_dummy_context,\n-\t.is_encrypted\t\t= ext4_encrypted_inode,\n \t.empty_dir\t\t= ext4_empty_dir,\n \t.max_namelen\t\t= ext4_max_namelen,\n };\n #else\n static const struct fscrypt_operations ext4_cryptops = {\n-\t.is_encrypted\t\t= ext4_encrypted_inode,\n };\n #endif\n \ndiff --git a/fs/f2fs/super.c b/fs/f2fs/super.c\nindex 89f61eb3d167..1cb41f711ab8 100644\n--- a/fs/f2fs/super.c\n+++ b/fs/f2fs/super.c\n@@ -1594,13 +1594,11 @@ static const struct fscrypt_operations f2fs_cryptops = {\n \t.key_prefix\t= \"f2fs:\",\n \t.get_context\t= f2fs_get_context,\n \t.set_context\t= f2fs_set_context,\n-\t.is_encrypted\t= f2fs_encrypted_inode,\n \t.empty_dir\t= f2fs_empty_dir,\n \t.max_namelen\t= f2fs_max_namelen,\n };\n #else\n static const struct fscrypt_operations f2fs_cryptops = {\n-\t.is_encrypted\t= f2fs_encrypted_inode,\n };\n #endif\n \ndiff --git a/fs/ubifs/crypto.c b/fs/ubifs/crypto.c\nindex 114ba455bac3..8880fa7733d8 100644\n--- a/fs/ubifs/crypto.c\n+++ b/fs/ubifs/crypto.c\n@@ -87,7 +87,6 @@ const struct fscrypt_operations ubifs_crypt_operations = {\n \t.key_prefix\t\t= \"ubifs:\",\n \t.get_context\t\t= ubifs_crypt_get_context,\n \t.set_context\t\t= ubifs_crypt_set_context,\n-\t.is_encrypted\t\t= __ubifs_crypt_is_encrypted,\n \t.empty_dir\t\t= ubifs_crypt_empty_dir,\n \t.max_namelen\t\t= ubifs_crypt_max_namelen,\n };\ndiff --git a/fs/ubifs/super.c b/fs/ubifs/super.c\nindex 5496b17b959c..adaca6088836 100644\n--- a/fs/ubifs/super.c\n+++ b/fs/ubifs/super.c\n@@ -2009,7 +2009,6 @@ static struct ubifs_info *alloc_ubifs_info(struct ubi_volume_desc *ubi)\n \n #ifndef CONFIG_UBIFS_FS_ENCRYPTION\n const struct fscrypt_operations ubifs_crypt_operations = {\n-\t.is_encrypted\t\t= __ubifs_crypt_is_encrypted,\n };\n #endif\n \ndiff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h\nindex cd43651f1731..7b17b70cbf33 100644\n--- a/fs/ubifs/ubifs.h\n+++ b/fs/ubifs/ubifs.h\n@@ -1835,18 +1835,13 @@ int ubifs_decrypt(const struct inode *inode, struct ubifs_data_node *dn,\n \n extern const struct fscrypt_operations ubifs_crypt_operations;\n \n-static inline bool __ubifs_crypt_is_encrypted(struct inode *inode)\n+static inline bool ubifs_crypt_is_encrypted(const struct inode *inode)\n {\n-\tstruct ubifs_inode *ui = ubifs_inode(inode);\n+\tconst struct ubifs_inode *ui = ubifs_inode(inode);\n \n \treturn ui->flags & UBIFS_CRYPT_FL;\n }\n \n-static inline bool ubifs_crypt_is_encrypted(const struct inode *inode)\n-{\n-\treturn __ubifs_crypt_is_encrypted((struct inode *)inode);\n-}\n-\n /* Normal UBIFS messages */\n __printf(2, 3)\n void ubifs_msg(const struct ubifs_info *c, const char *fmt, ...);\ndiff --git a/include/linux/fscrypt_common.h b/include/linux/fscrypt_common.h\nindex 97f738628b36..4164788f7793 100644\n--- a/include/linux/fscrypt_common.h\n+++ b/include/linux/fscrypt_common.h\n@@ -78,7 +78,6 @@ struct fscrypt_operations {\n \tint (*get_context)(struct inode *, void *, size_t);\n \tint (*set_context)(struct inode *, const void *, size_t, void *);\n \tbool (*dummy_context)(struct inode *);\n-\tbool (*is_encrypted)(struct inode *);\n \tbool (*empty_dir)(struct inode *);\n \tunsigned (*max_namelen)(struct inode *);\n };\n","prefixes":["03/25"]}