{"id":816561,"url":"http://patchwork.ozlabs.org/api/patches/816561/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20170920224605.22030-15-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-15-ebiggers3@gmail.com>","list_archive_url":null,"date":"2017-09-20T22:45:54","name":"[14/25] ext4: switch to fscrypt_prepare_lookup()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"f13485853d210117e0d55722793890680273e47a","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-15-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/816561/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816561/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=\"Jt7lgJYR\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyFKW1zMNz9sPm\n\tfor ;\n\tThu, 21 Sep 2017 08:49:03 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752202AbdITWsx (ORCPT );\n\tWed, 20 Sep 2017 18:48:53 -0400","from mail-pg0-f68.google.com ([74.125.83.68]:34823 \"EHLO\n\tmail-pg0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751704AbdITWrH (ORCPT\n\t); Wed, 20 Sep 2017 18:47:07 -0400","by mail-pg0-f68.google.com with SMTP id j16so2375922pga.2;\n\tWed, 20 Sep 2017 15:47:07 -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.05\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 20 Sep 2017 15:47:06 -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=Eugr3w2Ue39itRwqPhnN7tORfrUO8Jg50TZkVMAoucA=;\n\tb=Jt7lgJYRdfoQVUwHsIrnBAk1zHBx1Oixw9mfHm0wV4cTbM+oLauCjRSiRMZHpe4010\n\tIsQCHRVFUUjoV44kZBidas711VxLTv7+lkzS9GzpoF9QDpjobVaWb/BYrFLiyc7kRtrR\n\tAxcTleQTw0TnHZZ9x4aCvDw7ctBgKaulE7HblpxHWBq9KdhMYTdIWA+5v99fWJGSBmsi\n\tjrn0I8Ft094YLxjqxL0qiO5Cwew0FhzFKVqvYUFjkgawwI2Ri6fVqevhOhKPMRYVhXN2\n\tWyk+oUvl9kmUGcNyiOoEd1Fei0aotG19IkeJuO9/rS29Zzs+Mc6aYrUMV3fKsuOtAmIJ\n\ted8g==","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=Eugr3w2Ue39itRwqPhnN7tORfrUO8Jg50TZkVMAoucA=;\n\tb=K1xlHOsaUNue+ALdDH7nzJCXY0cqimbgQLVeLgBsH8a8bXguk1tVlB9t6MV05xi0OZ\n\tI29K8trF7vq8kxPnZ3QGaOAe4dj6GTRbFH3N1dYdTaK7o9j4aTvo/MykwQjOcnwSlfTY\n\tJ6uEM5exSKPqFaL/B8gmdOrcYBFlhIJTPH2SqUDwvJVR4rBinyhfb4NxL6/IGVrXpTgn\n\ty9MOIqBKWVp5z5vP+q2bs+Wjo/XtmMp6GGf6EGo+c8wUgKeNKUOZQWTQABizKW4cUlY3\n\tyFoyUvWubWMsUCwa4D6O63Y7PVK0Z1g4oiM6zVNmNfQiMIE4tEpjXdrZjNyHGZAoEO89\n\tP8cA==","X-Gm-Message-State":"AHPjjUiRvbTd26JLVqWTkrMo0rq1DU7c6mGH9AZ35txI/WOzkjXI0Mf4\n\ti+Az5Pjo6k8CQIu+0qkhsEIzUN0YlSE=","X-Google-Smtp-Source":"AOwi7QBejmwIUWTKqNhi9ll+OhOT+ZB/L/J7p7jbwjOOBo+dV4a8MrlObcOTdF1x7Zlcdicmz3ROMg==","X-Received":"by 10.84.132.34 with SMTP id 31mr3483910ple.225.1505947626710;\n\tWed, 20 Sep 2017 15:47:06 -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 14/25] ext4: switch to fscrypt_prepare_lookup()","Date":"Wed, 20 Sep 2017 15:45:54 -0700","Message-Id":"<20170920224605.22030-15-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/namei.c | 22 ++++++----------------\n 1 file changed, 6 insertions(+), 16 deletions(-)","diff":"diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c\nindex b2fbc2b87bcf..a6b6f09e0a88 100644\n--- a/fs/ext4/namei.c\n+++ b/fs/ext4/namei.c\n@@ -1538,24 +1538,14 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi\n \tstruct inode *inode;\n \tstruct ext4_dir_entry_2 *de;\n \tstruct buffer_head *bh;\n+\tint err;\n \n-\tif (ext4_encrypted_inode(dir)) {\n-\t\tint res = fscrypt_get_encryption_info(dir);\n-\n-\t\t/*\n-\t\t * DCACHE_ENCRYPTED_WITH_KEY is set if the dentry is\n-\t\t * created while the directory was encrypted and we\n-\t\t * have access to the key.\n-\t\t */\n-\t\tif (fscrypt_has_encryption_key(dir))\n-\t\t\tfscrypt_set_encrypted_dentry(dentry);\n-\t\tfscrypt_set_d_op(dentry);\n-\t\tif (res && res != -ENOKEY)\n-\t\t\treturn ERR_PTR(res);\n-\t}\n+\terr = fscrypt_prepare_lookup(dir, dentry, flags);\n+\tif (err)\n+\t\treturn ERR_PTR(err);\n \n- if (dentry->d_name.len > EXT4_NAME_LEN)\n-\t return ERR_PTR(-ENAMETOOLONG);\n+\tif (dentry->d_name.len > EXT4_NAME_LEN)\n+\t\treturn ERR_PTR(-ENAMETOOLONG);\n \n \tbh = ext4_find_entry(dir, &dentry->d_name, &de, NULL);\n \tif (IS_ERR(bh))\n","prefixes":["14/25"]}