{"id":816549,"url":"http://patchwork.ozlabs.org/api/patches/816549/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20170920224605.22030-26-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-26-ebiggers3@gmail.com>","list_archive_url":null,"date":"2017-09-20T22:46:05","name":"[25/25] ubifs: switch to fscrypt_prepare_setattr()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"53cdaf7a7e898faa705a246ee7f732d68abdaafc","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-26-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/816549/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816549/checks/","tags":{},"related":[],"headers":{"Return-Path":"<linux-ext4-owner@vger.kernel.org>","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=<UNKNOWN>)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"D7tzOiAI\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyFHf1Fmdz9sPk\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 21 Sep 2017 08:47:26 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752065AbdITWrU (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tWed, 20 Sep 2017 18:47:20 -0400","from mail-pg0-f68.google.com ([74.125.83.68]:34787 \"EHLO\n\tmail-pg0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751795AbdITWrT (ORCPT\n\t<rfc822; linux-ext4@vger.kernel.org>); Wed, 20 Sep 2017 18:47:19 -0400","by mail-pg0-f68.google.com with SMTP id u18so2379156pgo.1;\n\tWed, 20 Sep 2017 15:47:18 -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.17\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 20 Sep 2017 15:47:17 -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=XznOxbscM+Guz7zyOXZEtQLXMiA7EjYNtJ+c92S6E2g=;\n\tb=D7tzOiAIDtv8O95WdUO+BrCXDAqYvOu/MKUWr37+QByGJrRobenputFeMHEpiaySTl\n\t7TLsHNYVt47q/lOQNhZXqh3gKoh7aKBQZprHH5mh0tcqg00qWbtsALNb1HWDU7cazncd\n\txTlQdxPoCX+RLwN8BeZ01amwu9pEh8KCvv7N/HxC454CErpqQ5X5JhqDXPDvr4356a+e\n\t0nahPMHmsXWTsQBPIzi4RQbIQMg9sNCJBbXJY8+2DGjsLjlX0YDWxaIg6a/uhrRlEdvi\n\t1Wueop06sTeqrEA3+lDz/mCTsoefwLN5idbCiTzF9zdj9acZ08PFZFHUF1AElMPquEBg\n\tcVRQ==","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=XznOxbscM+Guz7zyOXZEtQLXMiA7EjYNtJ+c92S6E2g=;\n\tb=CRBHQeU3Kto01VB/HhqeOSZKqe8vo2UzyHy5vn4s+GgJ1Gh02aTWNskhP0sydxs5ee\n\tEburVwjosYb+qI7Es/DtpzChPo1y5H4A06uVY9y5xiW6/Kkeyb4W9hsbr7EUdkirThn5\n\tMWi94UyjaGwdtqCpr4XDCqtXhKWmW2LGp8AfIcMixC+b8yB6X+VP72Xg5aVJn+eunK3I\n\tc27lV4yBuEARiaPh6Xa5PbRSF3PTrhtAqIrMLSO4thjQrRFAhb32Eeik6KmOoFgdDr89\n\t85ua9gocBcH8FjGIqQK7hNb+G7TYCuuExfYv1EGRrWScl0vpx1Wlbb6MI2TF1hpPiff3\n\tXWaw==","X-Gm-Message-State":"AHPjjUj9bJEtTCnUxmN1+nhJvkblncG3xliMU62wLX8BDLnFxXg+OzGy\n\tEpE94GbvSlRWyJ2hls8zPthk/uq1XYc=","X-Google-Smtp-Source":"AOwi7QCsWbwbVr0eemv3tcaQWLmjvNRB+oCcrRAR5Ouepwi5z66gjMJabzhiWBxFghiiLSXtrqrPHQ==","X-Received":"by 10.84.143.165 with SMTP id 34mr3393170plz.91.1505947638274;\n\tWed, 20 Sep 2017 15:47:18 -0700 (PDT)","From":"Eric Biggers <ebiggers3@gmail.com>","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\" <tytso@mit.edu>,\n\tJaegeuk Kim <jaegeuk@kernel.org>, Michael Halcrow <mhalcrow@google.com>,\n\tEric Biggers <ebiggers@google.com>","Subject":"[PATCH 25/25] ubifs: switch to fscrypt_prepare_setattr()","Date":"Wed, 20 Sep 2017 15:46:05 -0700","Message-Id":"<20170920224605.22030-26-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":"<linux-ext4.vger.kernel.org>","X-Mailing-List":"linux-ext4@vger.kernel.org"},"content":"From: Eric Biggers <ebiggers@google.com>\n\nSigned-off-by: Eric Biggers <ebiggers@google.com>\n---\n fs/ubifs/file.c | 10 +++-------\n 1 file changed, 3 insertions(+), 7 deletions(-)","diff":"diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c\nindex 31dc632a52fc..f5578f1bd170 100644\n--- a/fs/ubifs/file.c\n+++ b/fs/ubifs/file.c\n@@ -1284,13 +1284,9 @@ int ubifs_setattr(struct dentry *dentry, struct iattr *attr)\n \tif (err)\n \t\treturn err;\n \n-\tif (ubifs_crypt_is_encrypted(inode) && (attr->ia_valid & ATTR_SIZE)) {\n-\t\terr = fscrypt_get_encryption_info(inode);\n-\t\tif (err)\n-\t\t\treturn err;\n-\t\tif (!fscrypt_has_encryption_key(inode))\n-\t\t\treturn -ENOKEY;\n-\t}\n+\terr = fscrypt_prepare_setattr(dentry, attr);\n+\tif (err)\n+\t\treturn err;\n \n \tif ((attr->ia_valid & ATTR_SIZE) && attr->ia_size < inode->i_size)\n \t\t/* Truncation to a smaller size */\n","prefixes":["25/25"]}