From: Chandan Rajendra <chandan@linux.vnet.ibm.com>
To: linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-doc@vger.kernel.org, linux-mips@linux-mips.org,
linux-s390@vger.kernel.org, linux-mtd@lists.infradead.org,
linux-fsdevel@vger.kernel.org
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>,
tytso@mit.edu, adilger.kernel@dilger.ca, ebiggers@kernel.org,
jaegeuk@kernel.org, yuchao0@huawei.com, corbet@lwn.net,
ralf@linux-mips.org, paul.burton@mips.com, jhogan@kernel.org,
green.hu@gmail.com, deanbo422@gmail.com, schwidefsky@de.ibm.com,
heiko.carstens@de.ibm.com, richard@nod.at, dedekind1@gmail.com,
adrian.hunter@intel.com, viro@zeniv.linux.org.uk
Subject: [PATCH V2 6/7] f2fs: use IS_VERITY() to check inode's fsverity status
Date: Tue, 4 Dec 2018 15:26:49 +0530 [thread overview]
Message-ID: <20181204095650.12562-7-chandan@linux.vnet.ibm.com> (raw)
In-Reply-To: <20181204095650.12562-1-chandan@linux.vnet.ibm.com>
This commit now uses IS_VERITY() macro to check if fsverity is
enabled on an inode.
Acked-by: Chao Yu <yuchao0@huawei.com>
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
WARNING: multiple messages have this Message-ID (diff)
From: Chandan Rajendra <chandan@linux.vnet.ibm.com>
To: linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-doc@vger.kernel.org, linux-mips@linux-mips.org,
linux-s390@vger.kernel.org, linux-mtd@lists.infradead.org,
linux-fsdevel@vger.kernel.org
Cc: dedekind1@gmail.com, tytso@mit.edu, corbet@lwn.net,
jhogan@kernel.org, heiko.carstens@de.ibm.com,
adrian.hunter@intel.com, ralf@linux-mips.org,
ebiggers@kernel.org, paul.burton@mips.com,
adilger.kernel@dilger.ca, green.hu@gmail.com, richard@nod.at,
schwidefsky@de.ibm.com, jaegeuk@kernel.org, deanbo422@gmail.com,
viro@zeniv.linux.org.uk
Subject: [PATCH V2 6/7] f2fs: use IS_VERITY() to check inode's fsverity status
Date: Tue, 4 Dec 2018 15:26:49 +0530 [thread overview]
Message-ID: <20181204095650.12562-7-chandan@linux.vnet.ibm.com> (raw)
In-Reply-To: <20181204095650.12562-1-chandan@linux.vnet.ibm.com>
This commit now uses IS_VERITY() macro to check if fsverity is
enabled on an inode.
Acked-by: Chao Yu <yuchao0@huawei.com>
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
next prev parent reply other threads:[~2018-12-04 9:57 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-04 9:56 [PATCH V2 0/7] Remove fs specific fscrypt and fsverity build config options Chandan Rajendra
2018-12-04 9:56 ` Chandan Rajendra
2018-12-04 9:56 ` [PATCH V2 1/7] ext4: use IS_ENCRYPTED() to check encryption status Chandan Rajendra
2018-12-04 9:56 ` Chandan Rajendra
2018-12-04 23:12 ` Eric Biggers
2018-12-04 23:12 ` Eric Biggers
2018-12-04 9:56 ` [PATCH V2 2/7] f2fs: " Chandan Rajendra
2018-12-04 9:56 ` Chandan Rajendra
2018-12-04 23:16 ` Eric Biggers
2018-12-04 23:16 ` Eric Biggers
2018-12-04 9:56 ` [PATCH V2 3/7] fscrypt: remove filesystem specific build config option Chandan Rajendra
2018-12-04 9:56 ` Chandan Rajendra
2018-12-04 23:43 ` Eric Biggers
2018-12-04 23:43 ` Eric Biggers
2018-12-08 7:07 ` Chandan Rajendra
2018-12-08 7:07 ` Chandan Rajendra
2018-12-10 18:04 ` Eric Biggers
2018-12-10 18:04 ` Eric Biggers
2018-12-05 0:05 ` Eric Biggers
2018-12-05 0:05 ` Eric Biggers
2018-12-12 1:52 ` Guenter Roeck
2018-12-12 1:52 ` Guenter Roeck
2018-12-12 2:48 ` Eric Biggers
2018-12-12 2:48 ` Eric Biggers
2018-12-12 3:16 ` Guenter Roeck
2018-12-12 3:16 ` Guenter Roeck
2018-12-12 6:27 ` Chandan Rajendra
2018-12-12 6:27 ` Chandan Rajendra
2018-12-04 9:56 ` [PATCH V2 4/7] Add S_VERITY and IS_VERITY() Chandan Rajendra
2018-12-04 9:56 ` Chandan Rajendra
2018-12-04 23:49 ` Eric Biggers
2018-12-04 23:49 ` Eric Biggers
2018-12-04 9:56 ` [PATCH V2 5/7] ext4: use IS_VERITY() to check inode's fsverity status Chandan Rajendra
2018-12-04 9:56 ` Chandan Rajendra
2018-12-04 23:55 ` Eric Biggers
2018-12-04 23:55 ` Eric Biggers
2018-12-04 9:56 ` Chandan Rajendra [this message]
2018-12-04 9:56 ` [PATCH V2 6/7] f2fs: " Chandan Rajendra
2018-12-04 23:57 ` Eric Biggers
2018-12-04 23:57 ` Eric Biggers
2018-12-04 9:56 ` [PATCH V2 7/7] fsverity: Remove filesystem specific build config option Chandan Rajendra
2018-12-04 9:56 ` Chandan Rajendra
2018-12-05 0:08 ` Eric Biggers
2018-12-05 0:08 ` Eric Biggers
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=20181204095650.12562-7-chandan@linux.vnet.ibm.com \
--to=chandan@linux.vnet.ibm.com \
--cc=adilger.kernel@dilger.ca \
--cc=adrian.hunter@intel.com \
--cc=corbet@lwn.net \
--cc=deanbo422@gmail.com \
--cc=dedekind1@gmail.com \
--cc=ebiggers@kernel.org \
--cc=green.hu@gmail.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jaegeuk@kernel.org \
--cc=jhogan@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
--cc=richard@nod.at \
--cc=schwidefsky@de.ibm.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=yuchao0@huawei.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.