{"id":816572,"url":"http://patchwork.ozlabs.org/api/patches/816572/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20170920224605.22030-5-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-5-ebiggers3@gmail.com>","list_archive_url":null,"date":"2017-09-20T22:45:44","name":"[04/25] fscrypt: remove unneeded empty fscrypt_operations structs","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"47dab89e4983eae3848d49c6373225257a419d97","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-5-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/816572/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816572/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=\"T1MN2p+Q\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyFLm2Qjjz9sBZ\n\tfor ;\n\tThu, 21 Sep 2017 08:50:08 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752203AbdITWuH (ORCPT );\n\tWed, 20 Sep 2017 18:50:07 -0400","from mail-pf0-f194.google.com ([209.85.192.194]:34858 \"EHLO\n\tmail-pf0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751799AbdITWq4 (ORCPT\n\t); Wed, 20 Sep 2017 18:46:56 -0400","by mail-pf0-f194.google.com with SMTP id i23so1721218pfi.2;\n\tWed, 20 Sep 2017 15:46:56 -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.54\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 20 Sep 2017 15:46:55 -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=MFzqJPTBM9fATpbCj1G1R6q2eqPueC9M9keqxOOH+CI=;\n\tb=T1MN2p+QWVqe7J199P+C/wgLIrUGBCcIOGaHif7LdWVwAC/5GkJfn9rDi6kCh9ko1G\n\tWgewNp62f1e2n790usAbMfq4PLNlZoMeKuaQWK2Y/L3uO3h3ZAh+11NkiQmxQXsamugi\n\trz7EUV2Vld49iAYMpzc1Df/yHB19iGjGMUtcf+lYIbbHwuSDiQaJ8xFVMcSWzPs4UNBV\n\t9zgA6zoY6RnmzQQg97Ga2O9T1xgBDUqzppIBds6eOfXKBLUG192exMH+ar+ARqFRPRyN\n\tcj7rZECyWEBQQsjvo3enZZ0Q3ew7DX2pr4pTjtuPCkF1FdPI26lm9LNR0ljhVNdXGQza\n\tkE0g==","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=MFzqJPTBM9fATpbCj1G1R6q2eqPueC9M9keqxOOH+CI=;\n\tb=jKana9UJpOjTn5hbPMxrgqioBrw2EKYBiz3ce2xYC6JHKl2QnPVMSvQNoR/DbmGGAE\n\tR8IaDqqVFYMEo2BXIDM4L9HMSOiTg9fTyxXsFQVR5RQsp/rmD7rhSDUCRe8IPggTq3+J\n\tsOE3WEEyqIX8/uLBss64bfdlyFaQ3aH0/+a8ShJALWYMQspln6hND0A5ONfTXZwd/rec\n\tn/0c2eeSJ3vRcqLmQmp8uqoHJ2v90I7zA3EQNJ6UityP3ThsXu9WmnzSxD8oX3ke2dGp\n\tAgipdD5X+wbDqaqmQLSTNcLwW1qI1UOvH8bztX6Z2wXA5g6Ksc3Nz9YX3UV/owlzFgcW\n\tY3Mg==","X-Gm-Message-State":"AHPjjUhsrO24oRpqi1ya5putcuWVkte8ewwgLy2XAqP4eNe/CC/k11Dr\n\txqoSTw5QF76ns9j0s9cDNLSECUz3cdI=","X-Google-Smtp-Source":"AOwi7QBvaEXywaWbPrbZC2q4FHGeQS7Li62DVLnS06ZS2mDKr0CJJekqsKjGtEx+kBuln+hJ+uFAFQ==","X-Received":"by 10.159.216.146 with SMTP id s18mr3499414plp.451.1505947615604;\n\tWed, 20 Sep 2017 15:46:55 -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 04/25] fscrypt: remove unneeded empty fscrypt_operations\n\tstructs","Date":"Wed, 20 Sep 2017 15:45:44 -0700","Message-Id":"<20170920224605.22030-5-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\nIn the case where a filesystem has been configured without encryption\nsupport, there is no longer any need to initialize ->s_cop at all, since\nnone of the methods are ever called.\n\nSigned-off-by: Eric Biggers \n---\n fs/ext4/super.c | 5 ++---\n fs/f2fs/super.c | 5 ++---\n fs/ubifs/super.c | 7 ++-----\n 3 files changed, 6 insertions(+), 11 deletions(-)","diff":"diff --git a/fs/ext4/super.c b/fs/ext4/super.c\nindex bc63cdf194e3..04f3670748e7 100644\n--- a/fs/ext4/super.c\n+++ b/fs/ext4/super.c\n@@ -1244,9 +1244,6 @@ static const struct fscrypt_operations ext4_cryptops = {\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-};\n #endif\n \n #ifdef CONFIG_QUOTA\n@@ -3998,7 +3995,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)\n \tsb->s_op = &ext4_sops;\n \tsb->s_export_op = &ext4_export_ops;\n \tsb->s_xattr = ext4_xattr_handlers;\n+#ifdef CONFIG_EXT4_FS_ENCRYPTION\n \tsb->s_cop = &ext4_cryptops;\n+#endif\n #ifdef CONFIG_QUOTA\n \tsb->dq_op = &ext4_quota_operations;\n \tif (ext4_has_feature_quota(sb))\ndiff --git a/fs/f2fs/super.c b/fs/f2fs/super.c\nindex 1cb41f711ab8..c1c7183b3527 100644\n--- a/fs/f2fs/super.c\n+++ b/fs/f2fs/super.c\n@@ -1597,9 +1597,6 @@ static const struct fscrypt_operations f2fs_cryptops = {\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-};\n #endif\n \n static struct inode *f2fs_nfs_get_inode(struct super_block *sb,\n@@ -2318,7 +2315,9 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)\n #endif\n \n \tsb->s_op = &f2fs_sops;\n+#ifdef CONFIG_F2FS_FS_ENCRYPTION\n \tsb->s_cop = &f2fs_cryptops;\n+#endif\n \tsb->s_xattr = f2fs_xattr_handlers;\n \tsb->s_export_op = &f2fs_export_ops;\n \tsb->s_magic = F2FS_SUPER_MAGIC;\ndiff --git a/fs/ubifs/super.c b/fs/ubifs/super.c\nindex adaca6088836..7503e7cdf870 100644\n--- a/fs/ubifs/super.c\n+++ b/fs/ubifs/super.c\n@@ -2007,11 +2007,6 @@ static struct ubifs_info *alloc_ubifs_info(struct ubi_volume_desc *ubi)\n \treturn c;\n }\n \n-#ifndef CONFIG_UBIFS_FS_ENCRYPTION\n-const struct fscrypt_operations ubifs_crypt_operations = {\n-};\n-#endif\n-\n static int ubifs_fill_super(struct super_block *sb, void *data, int silent)\n {\n \tstruct ubifs_info *c = sb->s_fs_info;\n@@ -2054,7 +2049,9 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)\n \t\tsb->s_maxbytes = c->max_inode_sz = MAX_LFS_FILESIZE;\n \tsb->s_op = &ubifs_super_operations;\n \tsb->s_xattr = ubifs_xattr_handlers;\n+#ifdef CONFIG_UBIFS_FS_ENCRYPTION\n \tsb->s_cop = &ubifs_crypt_operations;\n+#endif\n \n \tmutex_lock(&c->umount_mutex);\n \terr = mount_ubifs(c);\n","prefixes":["04/25"]}