{"id":816559,"url":"http://patchwork.ozlabs.org/api/patches/816559/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-mtd/patch/20170920224605.22030-3-ebiggers3@gmail.com/","project":{"id":3,"url":"http://patchwork.ozlabs.org/api/projects/3/?format=json","name":"Linux MTD development","link_name":"linux-mtd","list_id":"linux-mtd.lists.infradead.org","list_email":"linux-mtd@lists.infradead.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170920224605.22030-3-ebiggers3@gmail.com>","list_archive_url":null,"date":"2017-09-20T22:45:42","name":"[02/25] fscrypt: switch from ->is_encrypted() to IS_ENCRYPTED()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"7eac5aa311a7166f544aa67c06e81c4a974ef417","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-mtd/patch/20170920224605.22030-3-ebiggers3@gmail.com/mbox/","series":[{"id":4250,"url":"http://patchwork.ozlabs.org/api/series/4250/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-mtd/list/?series=4250","date":"2017-09-20T22:45:45","name":"fscrypt: add some higher-level helper functions","version":1,"mbox":"http://patchwork.ozlabs.org/series/4250/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816559/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816559/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"ctmKwDo1\"; \n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"Gl3mCFOp\"; dkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xyFKB1Njsz9sNr\n\tfor ;\n\tThu, 21 Sep 2017 08:48:46 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dunnI-00061a-M5; Wed, 20 Sep 2017 22:48:36 +0000","from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241])\n\tby bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dunlx-0004wS-PU\n\tfor linux-mtd@lists.infradead.org; Wed, 20 Sep 2017 22:47:21 +0000","by mail-pg0-x241.google.com with SMTP id m30so2366646pgn.5\n\tfor ;\n\tWed, 20 Sep 2017 15:46:53 -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.52\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 20 Sep 2017 15:46:52 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:\n\tList-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References:\n\tIn-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID:\n\tContent-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc\n\t:Resent-Message-ID:List-Owner;\n\tbh=txm3wUCmzwXZyXQ2jcxisFhAKpAGosHGGilSDuRxBX0=;\n\tb=ctmKwDo1F8jevtT6Uv9sl+uWXv\n\tbLTS/fOsFGwikjrGUICrmQSjuQXmrMdaqd/ED/pZP0o42IB6JfLp2JyVKHlJfOfP6Yr6QOw2F/aHl\n\tdU6lFy+VXKfxxRmtp/6L4y5nS5mDKfo8VmHy1kGoXcDSrfy4nUNCDEG8y8nbpJDcDQHFtq/3F6Dtn\n\tjoZ287XSUM/0f9kkBgo5os2xNo0wb10ljtaOmNjra3uAdz2sC+Hd2PREe7qQjabHcK+Chh4PkNX6s\n\t/UfxaL32uBHAl8Yt6fg3VwLeuAXxg/vqDcsk8IWzlTxzYJq5B+Au9G2Za/uRZ5DBdIcaPr5/TNa46\n\tLT4qAzMw==;","v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=X0DJewv8zNfuMxJnJUk58uqAADv+TgJmFmFIcaUZmc0=;\n\tb=Gl3mCFOpb9uX5dQkI3hXFKHuwCT5Z1xnBZTdMsKpBm82ojNTpzMW7SVCnvw7WlQj5a\n\tU1P5swZu9d4ilPOticRCTofOqAr50UCOGQPyNXBTAHEfgrT51Pu5M4HMvG7nfddvmvV4\n\t887NPiRH0cu/2sJW92A70Icwwx39xBIourT5DeVly1qzYt9Izcb+IKu4ITPo6iuTsDT9\n\ty7nB5z2sXbDKYWOqGojBnKnt/ghqFiAWuSX3DBGuNillLks8ofZzSbZvER3miPGn6xbg\n\tIXLXcMHJENxE7t/zsIgLjdwsjEfavcZ4TaNHG1muwYHw/jcpkHn4zZrwgUGAZsVDT1+L\n\txrAQ=="],"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=X0DJewv8zNfuMxJnJUk58uqAADv+TgJmFmFIcaUZmc0=;\n\tb=Zc2KxiOhIn/fXuMOeKLsqMMXanhPsAKpser+etd+3F5LedI09C96alCm/6MzmoQ+vI\n\tKxnUBDhCxnNwFKx/+mTVG5zuI77U7FzCPsZpe8mHLhurnCaP6OFUYJoQvJX5V+TioYwo\n\tgkBqT7PMEwT3BcO1BhbDOJiIcVGmm/zdFQpgsLRPWa1+6EAl5r3WabhIthDwcySI1Nxr\n\tAPOtGbj+iKFPO/sIjY8rsOIN71lsg/dfV/OBCuQp3PBJ72idsHxGixlQJc3FNWEYBNw6\n\tz7sBRcu4c0Gej1D6NOfHH55hwjeB4WOVI9T5I8snknc1dJCrMKLIIO27gHeW07MEWDV5\n\tB9Rg==","X-Gm-Message-State":"AHPjjUh7RVm/sFfXDQ5NVZM8BllPORxKwXcfhaZoAQ4BopM3bIHo8nql\n\t1Nt+4bAQeV9Kd8mV7MyKBiA0zqd15kw=","X-Google-Smtp-Source":"AOwi7QDixjM83fpXsFwm0/OrKVD1ndF+PLOi4hkYaUvTORbra0Lmyvr3Uk36Yk0sGCXTQNC7/PQ84A==","X-Received":"by 10.84.194.131 with SMTP id h3mr3541630pld.352.1505947613266; \n\tWed, 20 Sep 2017 15:46:53 -0700 (PDT)","From":"Eric Biggers ","To":"linux-fscrypt@vger.kernel.org","Subject":"[PATCH 02/25] fscrypt: switch from ->is_encrypted() to\n\tIS_ENCRYPTED()","Date":"Wed, 20 Sep 2017 15:45:42 -0700","Message-Id":"<20170920224605.22030-3-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>","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170920_154713_889681_2C8D5D58 ","X-CRM114-Status":"GOOD ( 12.95 )","X-Spam-Score":"-1.8 (-)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-1.8 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/,\n\tno\n\ttrust [2607:f8b0:400e:c05:0:0:0:241 listed in] [list.dnswl.org]\n\t-0.0 SPF_PASS SPF: sender matches SPF record\n\t0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends\n\tin digit (ebiggers3[at]gmail.com)\n\t0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\n\tprovider (ebiggers3[at]gmail.com)\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]\n\t-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature\n\t0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n\tnot necessarily valid\n\t-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n\tauthor's domain","X-BeenThere":"linux-mtd@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"Linux MTD discussion mailing list ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"\"Theodore Y . Ts'o\" , Eric Biggers , \n\tMichael Halcrow ,\n\tlinux-f2fs-devel@lists.sourceforge.net, \n\tlinux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org,\n\tJaegeuk Kim , linux-ext4@vger.kernel.org","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"linux-mtd\" ","Errors-To":"linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"From: Eric Biggers \n\nIS_ENCRYPTED() now gives the same information as\ni_sb->s_cop->is_encrypted() but is more efficient, since IS_ENCRYPTED()\nis just a simple flag check. Prepare to remove ->is_encrypted() by\nswitching all callers to IS_ENCRYPTED().\n\nSigned-off-by: Eric Biggers \n---\n fs/crypto/crypto.c | 2 +-\n fs/crypto/fname.c | 3 +--\n fs/crypto/keyinfo.c | 2 +-\n fs/crypto/policy.c | 6 +++---\n include/linux/fscrypt_notsupp.h | 2 +-\n 5 files changed, 7 insertions(+), 8 deletions(-)","diff":"diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c\nindex c7835df7e7b8..608f6bbe0f31 100644\n--- a/fs/crypto/crypto.c\n+++ b/fs/crypto/crypto.c\n@@ -340,7 +340,7 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)\n \t\treturn -ECHILD;\n \n \tdir = dget_parent(dentry);\n-\tif (!d_inode(dir)->i_sb->s_cop->is_encrypted(d_inode(dir))) {\n+\tif (!IS_ENCRYPTED(d_inode(dir))) {\n \t\tdput(dir);\n \t\treturn 0;\n \t}\ndiff --git a/fs/crypto/fname.c b/fs/crypto/fname.c\nindex ad9f814fdead..2878289b3ed2 100644\n--- a/fs/crypto/fname.c\n+++ b/fs/crypto/fname.c\n@@ -382,8 +382,7 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname,\n \tmemset(fname, 0, sizeof(struct fscrypt_name));\n \tfname->usr_fname = iname;\n \n-\tif (!dir->i_sb->s_cop->is_encrypted(dir) ||\n-\t\t\t\tfscrypt_is_dot_dotdot(iname)) {\n+\tif (!IS_ENCRYPTED(dir) || fscrypt_is_dot_dotdot(iname)) {\n \t\tfname->disk_name.name = (unsigned char *)iname->name;\n \t\tfname->disk_name.len = iname->len;\n \t\treturn 0;\ndiff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c\nindex 018c588c7ac3..236a68d4ea72 100644\n--- a/fs/crypto/keyinfo.c\n+++ b/fs/crypto/keyinfo.c\n@@ -268,7 +268,7 @@ int fscrypt_get_encryption_info(struct inode *inode)\n \tres = inode->i_sb->s_cop->get_context(inode, &ctx, sizeof(ctx));\n \tif (res < 0) {\n \t\tif (!fscrypt_dummy_context_enabled(inode) ||\n-\t\t inode->i_sb->s_cop->is_encrypted(inode))\n+\t\t IS_ENCRYPTED(inode))\n \t\t\treturn res;\n \t\t/* Fake up a context for an unencrypted directory */\n \t\tmemset(&ctx, 0, sizeof(ctx));\ndiff --git a/fs/crypto/policy.c b/fs/crypto/policy.c\nindex ce07a86200f3..6a63b8a0d46c 100644\n--- a/fs/crypto/policy.c\n+++ b/fs/crypto/policy.c\n@@ -109,7 +109,7 @@ int fscrypt_ioctl_get_policy(struct file *filp, void __user *arg)\n \tstruct fscrypt_policy policy;\n \tint res;\n \n-\tif (!inode->i_sb->s_cop->is_encrypted(inode))\n+\tif (!IS_ENCRYPTED(inode))\n \t\treturn -ENODATA;\n \n \tres = inode->i_sb->s_cop->get_context(inode, &ctx, sizeof(ctx));\n@@ -166,11 +166,11 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child)\n \t\treturn 1;\n \n \t/* No restrictions if the parent directory is unencrypted */\n-\tif (!cops->is_encrypted(parent))\n+\tif (!IS_ENCRYPTED(parent))\n \t\treturn 1;\n \n \t/* Encrypted directories must not contain unencrypted files */\n-\tif (!cops->is_encrypted(child))\n+\tif (!IS_ENCRYPTED(child))\n \t\treturn 0;\n \n \t/*\ndiff --git a/include/linux/fscrypt_notsupp.h b/include/linux/fscrypt_notsupp.h\nindex ec406aed2f2f..3f1325ec4646 100644\n--- a/include/linux/fscrypt_notsupp.h\n+++ b/include/linux/fscrypt_notsupp.h\n@@ -97,7 +97,7 @@ static inline int fscrypt_setup_filename(struct inode *dir,\n \t\t\t\t\t const struct qstr *iname,\n \t\t\t\t\t int lookup, struct fscrypt_name *fname)\n {\n-\tif (dir->i_sb->s_cop->is_encrypted(dir))\n+\tif (IS_ENCRYPTED(dir))\n \t\treturn -EOPNOTSUPP;\n \n \tmemset(fname, 0, sizeof(struct fscrypt_name));\n","prefixes":["02/25"]}