[20/25] f2fs: switch to fscrypt_prepare_setattr()

Message ID	20170920224605.22030-21-ebiggers3@gmail.com
State	Not Applicable, archived
Headers	show Return-Path: <linux-ext4-owner@vger.kernel.org> From: Eric Biggers <ebiggers3@gmail.com> To: linux-fscrypt@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, "Theodore Y . Ts'o" <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org>, Michael Halcrow <mhalcrow@google.com>, Eric Biggers <ebiggers@google.com> Subject: [PATCH 20/25] f2fs: switch to fscrypt_prepare_setattr() Date: Wed, 20 Sep 2017 15:46:00 -0700 Message-Id: <20170920224605.22030-21-ebiggers3@gmail.com> 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
Series	fscrypt: add some higher-level helper functions \| expand [00/25] fscrypt: add some higher-level helper functions [01/25] fs, fscrypt: add an S_ENCRYPTED inode flag [02/25] fscrypt: switch from ->is_encrypted() to IS_ENCRYPTED() [03/25] fscrypt: remove ->is_encrypted() [04/25] fscrypt: remove unneeded empty fscrypt_operations structs [05/25] fscrypt: new helper function - fscrypt_require_key() [06/25] fscrypt: new helper function - fscrypt_file_open() [07/25] fscrypt: new helper function - fscrypt_prepare_link() [08/25] fscrypt: new helper function - fscrypt_prepare_rename() [09/25] fscrypt: new helper function - fscrypt_prepare_lookup() [10/25] fscrypt: new helper function - fscrypt_prepare_setattr() [11/25] ext4: switch to fscrypt_file_open() [12/25] ext4: switch to fscrypt_prepare_link() [13/25] ext4: switch to fscrypt_prepare_rename() [14/25] ext4: switch to fscrypt_prepare_lookup() [15/25] ext4: switch to fscrypt_prepare_setattr() [16/25] f2fs: switch to fscrypt_file_open() [17/25] f2fs: switch to fscrypt_prepare_link() [18/25] f2fs: switch to fscrypt_prepare_rename() [19/25] f2fs: switch to fscrypt_prepare_lookup() [20/25] f2fs: switch to fscrypt_prepare_setattr() [21/25] ubifs: switch to fscrypt_file_open() [22/25] ubifs: switch to fscrypt_prepare_link() [23/25] ubifs: switch to fscrypt_prepare_rename() [24/25] ubifs: switch to fscrypt_prepare_lookup() [25/25] ubifs: switch to fscrypt_prepare_setattr()

Message ID

20170920224605.22030-21-ebiggers3@gmail.com

State

Not Applicable, archived

Headers

From: Eric Biggers <ebiggers3@gmail.com>
To: linux-fscrypt@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
	linux-f2fs-devel@lists.sourceforge.net,
	linux-mtd@lists.infradead.org, "Theodore Y . Ts'o" <tytso@mit.edu>,
	Jaegeuk Kim <jaegeuk@kernel.org>, Michael Halcrow <mhalcrow@google.com>,
	Eric Biggers <ebiggers@google.com>
Subject: [PATCH 20/25] f2fs: switch to fscrypt_prepare_setattr()
Date: Wed, 20 Sep 2017 15:46:00 -0700
Message-Id: <20170920224605.22030-21-ebiggers3@gmail.com>
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

Series

fscrypt: add some higher-level helper functions | expand

Commit Message

Eric Biggers Sept. 20, 2017, 10:46 p.m. UTC

From: Eric Biggers <ebiggers@google.com>

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/f2fs/file.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 8cef3931a00b..629bb91fa44e 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -714,6 +714,10 @@  int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 	if (err)
 		return err;
 
+	err = fscrypt_prepare_setattr(dentry, attr);
+	if (err)
+		return err;
+
 	if (is_quota_modification(inode, attr)) {
 		err = dquot_initialize(inode);
 		if (err)
@@ -729,14 +733,6 @@  int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 	}
 
 	if (attr->ia_valid & ATTR_SIZE) {
-		if (f2fs_encrypted_inode(inode)) {
-			err = fscrypt_get_encryption_info(inode);
-			if (err)
-				return err;
-			if (!fscrypt_has_encryption_key(inode))
-				return -ENOKEY;
-		}
-
 		if (attr->ia_size <= i_size_read(inode)) {
 			down_write(&F2FS_I(inode)->i_mmap_sem);
 			truncate_setsize(inode, attr->ia_size);

[20/25] f2fs: switch to fscrypt_prepare_setattr()

Commit Message

Patch