linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chandan Rajendra <chandan@linux.vnet.ibm.com>
To: linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org,
	linux-f2fs-devel@lists.sourceforge.net
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>,
	ebiggers@kernel.org, tytso@mit.edu
Subject: [PATCH 6/7] f2fs: use IS_VERITY() to check inode's fsverity status
Date: Mon, 19 Nov 2018 10:53:23 +0530	[thread overview]
Message-ID: <20181119052324.31456-7-chandan@linux.vnet.ibm.com> (raw)
In-Reply-To: <20181119052324.31456-1-chandan@linux.vnet.ibm.com>

This commit now uses IS_VERITY() macro to check if fsverity is
enabled on an inode.

Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
---
 fs/f2fs/file.c  | 6 +++---
 fs/f2fs/inode.c | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 6c7ad15000b9..2eb4821d95d1 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -491,7 +491,7 @@ static int f2fs_file_open(struct inode *inode, struct file *filp)
 	if (err)
 		return err;
 
-	if (f2fs_verity_file(inode)) {
+	if (IS_VERITY(inode)) {
 		err = fsverity_file_open(inode, filp);
 		if (err)
 			return err;
@@ -701,7 +701,7 @@ int f2fs_getattr(const struct path *path, struct kstat *stat,
 	struct f2fs_inode *ri;
 	unsigned int flags;
 
-	if (f2fs_verity_file(inode)) {
+	if (IS_VERITY(inode)) {
 		/*
 		 * For fs-verity we need to override i_size with the original
 		 * data i_size.  This requires I/O to the file which with
@@ -800,7 +800,7 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 	if (err)
 		return err;
 
-	if (f2fs_verity_file(inode)) {
+	if (IS_VERITY(inode)) {
 		err = fsverity_prepare_setattr(dentry, attr);
 		if (err)
 			return err;
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index ddef483ad689..02806feed64c 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -45,9 +45,11 @@ void f2fs_set_inode_flags(struct inode *inode)
 		new_fl |= S_DIRSYNC;
 	if (f2fs_encrypted_inode(inode))
 		new_fl |= S_ENCRYPTED;
+	if (f2fs_verity_file(inode))
+		new_fl |= S_VERITY;
 	inode_set_flags(inode, new_fl,
 			S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|
-			S_ENCRYPTED);
+			S_ENCRYPTED|S_VERITY);
 }
 
 static void __get_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
-- 
2.19.1

  parent reply	other threads:[~2018-11-19 15:47 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-19  5:23 [PATCH 0/7] Remove fs specific fscrypt and fsverity build config options Chandan Rajendra
2018-11-19  5:23 ` [PATCH 1/7] ext4: use IS_ENCRYPTED() to check encryption status Chandan Rajendra
2018-11-27  0:35   ` Eric Biggers
2018-11-19  5:23 ` [PATCH 2/7] f2fs: " Chandan Rajendra
2018-11-19  6:24   ` Chao Yu
2018-11-19 21:23   ` [f2fs-dev] " Jaegeuk Kim
2018-11-26  3:41     ` Theodore Y. Ts'o
2018-11-26  4:00       ` Theodore Y. Ts'o
2018-11-26 17:34         ` Theodore Y. Ts'o
2018-11-26 23:52           ` Jaegeuk Kim
2018-11-29 10:38           ` Chandan Rajendra
2018-11-29 19:05             ` Eric Biggers
2018-11-30  5:27               ` Chandan Rajendra
2018-11-30 17:44                 ` Eric Biggers
2018-11-19  5:23 ` [PATCH 3/7] fscrypt: Remove filesystem specific build config option Chandan Rajendra
2018-11-27  0:14   ` Eric Biggers
2018-11-27 13:29     ` Chandan Rajendra
2018-11-19  5:23 ` [PATCH 4/7] Add S_VERITY and IS_VERITY() Chandan Rajendra
2018-11-27  0:08   ` Eric Biggers
2018-11-27 13:30     ` Chandan Rajendra
2018-11-19  5:23 ` [PATCH 5/7] ext4: use IS_VERITY() to check inode's fsverity status Chandan Rajendra
2018-11-26 17:36   ` Theodore Y. Ts'o
2018-11-27  0:29     ` Eric Biggers
2018-11-27  3:03     ` Chandan Rajendra
2018-11-28 13:49     ` Chandan Rajendra
2018-11-19  5:23 ` Chandan Rajendra [this message]
2018-11-19  6:25   ` [f2fs-dev] [PATCH 6/7] f2fs: " Chao Yu
2018-11-27  0:41   ` Eric Biggers
2018-11-19  5:23 ` [PATCH 7/7] fsverity: Remove filesystem specific build config option Chandan Rajendra
2018-11-27  0:45   ` Eric Biggers
2018-11-27 13:31     ` Chandan Rajendra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181119052324.31456-7-chandan@linux.vnet.ibm.com \
    --to=chandan@linux.vnet.ibm.com \
    --cc=ebiggers@kernel.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=linux-fscrypt@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).