{"id":816564,"url":"http://patchwork.ozlabs.org/api/patches/816564/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20170920224605.22030-12-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-12-ebiggers3@gmail.com>","list_archive_url":null,"date":"2017-09-20T22:45:51","name":"[11/25] ext4: switch to fscrypt_file_open()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"55457c9f204518c4dc16eb41c9bca43953948545","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-12-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/816564/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816564/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=\"kLXBsgB/\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyFKv6mQcz9sNr\n\tfor ;\n\tThu, 21 Sep 2017 08:49:23 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752225AbdITWtW (ORCPT );\n\tWed, 20 Sep 2017 18:49:22 -0400","from mail-pg0-f66.google.com ([74.125.83.66]:35905 \"EHLO\n\tmail-pg0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751932AbdITWrE (ORCPT\n\t); Wed, 20 Sep 2017 18:47:04 -0400","by mail-pg0-f66.google.com with SMTP id d8so2372800pgt.3;\n\tWed, 20 Sep 2017 15:47:04 -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.47.02\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 20 Sep 2017 15:47:03 -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=WkaWCp5pR1c59n1k9Hk5rcxNp21Vt5Cmt3ZJ6yMdHpg=;\n\tb=kLXBsgB/KIfRmHIqIuxnfkunzMEUBshljntVnRWppmlvFvnCqE9uyePCu/uDvcrqXC\n\tmzOjBc67AoIS1Rw/HzG95KbZNWKhre/94h9xe2Q5leEZt6YFGYuTk2JN3i/Yj05ZrFoW\n\teC1ZDdc1OZ9UEYsfu6SwB+QQ4/sSqNrs48j/xGkCj9/OmONZmiWFTwRH4ClToC7+gFux\n\tX+7y/hBDRISv5gUJUoQ9X/u5Z+xz7QXZVRwlSsPMC79uKT1hNciWmx0Xx4bTwBYmsdeK\n\tLsEjYBS8LxYVYOnFK2VtCztbwG3jP84yZ5uAnJZK0IyiYIzze826phYFAjY69pkXxEMr\n\tR54g==","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=WkaWCp5pR1c59n1k9Hk5rcxNp21Vt5Cmt3ZJ6yMdHpg=;\n\tb=iwzMk3T/urwdDZA3px6OSHHFzHN8a1aYlGxp83ea7K8utdDOKzN8WdtOf2beUB003U\n\th1wW1KCRJbzExaq9Q5Kt0z6/m0/AVcnTA7CekRBk9XDZb3mEsLkJ0WXi9h54Y74b7el5\n\tsdlfaco9uFuQHUMljXcAonRbuC9K6xeCeKRSh3dqmZDTfXjmF+H8kxaadkNawQSc69a2\n\tOBJ1nUWZHSuOZU4TEYZdGj2WTyVXUK/DmdnTIrOqhUJe7tZax9XeY8tcL3K4AUv8bg20\n\tt2LQLoO5qql02phVeE1t3v4vqoIegzxo0NHFAOpnEiyIwJO0A7o/05vHkSmtubK7YEoC\n\tZHLw==","X-Gm-Message-State":"AHPjjUgc0WGs12X1Jq86pHf+JlDlwJWDCNbl77C/KA/2iuu/N/cBj9cB\n\tahPXEbRK3U9wtUlzOYC1Iv0DIHE/+rQ=","X-Google-Smtp-Source":"AOwi7QA1vfrMiRTSlpSYAT012BUIs2xUqd4Ah8lXY7/pjuw6Nn4/CBBg5+NwmSjxeVIX4w/6gywkvQ==","X-Received":"by 10.99.168.1 with SMTP id o1mr3640561pgf.72.1505947623552;\n\tWed, 20 Sep 2017 15:47:03 -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 11/25] ext4: switch to fscrypt_file_open()","Date":"Wed, 20 Sep 2017 15:45:51 -0700","Message-Id":"<20170920224605.22030-12-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\nSigned-off-by: Eric Biggers \n---\n fs/ext4/file.c | 23 ++++-------------------\n 1 file changed, 4 insertions(+), 19 deletions(-)","diff":"diff --git a/fs/ext4/file.c b/fs/ext4/file.c\nindex b1da660ac3bc..ffe9144088f8 100644\n--- a/fs/ext4/file.c\n+++ b/fs/ext4/file.c\n@@ -364,7 +364,6 @@ static int ext4_file_open(struct inode * inode, struct file * filp)\n \tstruct super_block *sb = inode->i_sb;\n \tstruct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);\n \tstruct vfsmount *mnt = filp->f_path.mnt;\n-\tstruct dentry *dir;\n \tstruct path path;\n \tchar buf[64], *cp;\n \tint ret;\n@@ -404,25 +403,11 @@ static int ext4_file_open(struct inode * inode, struct file * filp)\n \t\t\text4_journal_stop(handle);\n \t\t}\n \t}\n-\tif (ext4_encrypted_inode(inode)) {\n-\t\tret = fscrypt_get_encryption_info(inode);\n-\t\tif (ret)\n-\t\t\treturn -EACCES;\n-\t\tif (!fscrypt_has_encryption_key(inode))\n-\t\t\treturn -ENOKEY;\n-\t}\n \n-\tdir = dget_parent(file_dentry(filp));\n-\tif (ext4_encrypted_inode(d_inode(dir)) &&\n-\t\t\t!fscrypt_has_permitted_context(d_inode(dir), inode)) {\n-\t\text4_warning(inode->i_sb,\n-\t\t\t \"Inconsistent encryption contexts: %lu/%lu\",\n-\t\t\t (unsigned long) d_inode(dir)->i_ino,\n-\t\t\t (unsigned long) inode->i_ino);\n-\t\tdput(dir);\n-\t\treturn -EPERM;\n-\t}\n-\tdput(dir);\n+\tret = fscrypt_file_open(inode, filp);\n+\tif (ret)\n+\t\treturn ret;\n+\n \t/*\n \t * Set up the jbd2_inode if we are opening the inode for\n \t * writing and the journal is present\n","prefixes":["11/25"]}