[f2fs-dev] [PATCH V4 9/9] fsverity: Move verity status check to fsverity_prepare_setattr

[Chandan Rajendra]

Instead of conditionally checking for verity status of an inode before
invoking fsverity_prepare_setattr(), this commit moves the check inside the
definition of fsverity_prepare_setattr().

Signed-off-by: Chandan Rajendra <chan...@linux.vnet.ibm.com>
---
 fs/ext4/inode.c          | 8 +++-----
 fs/f2fs/file.c           | 8 +++-----
 fs/verity/setup.c        | 2 +-
 include/linux/fsverity.h | 5 ++++-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 703f55635824..44561e68886b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5510,11 +5510,9 @@ int ext4_setattr(struct dentry *dentry, struct iattr 
*attr)
        if (error)
                return error;
 
-       if (IS_VERITY(inode)) {
-               error = fsverity_prepare_setattr(dentry, attr);
-               if (error)
-                       return error;
-       }
+       error = fsverity_prepare_setattr(dentry, attr);
+       if (error)
+               return error;
 
        if (is_quota_modification(inode, attr)) {
                error = dquot_initialize(inode);
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 925c0d9608da..422907ca37c6 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -798,11 +798,9 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
        if (err)
                return err;
 
-       if (IS_VERITY(inode)) {
-               err = fsverity_prepare_setattr(dentry, attr);
-               if (err)
-                       return err;
-       }
+       err = fsverity_prepare_setattr(dentry, attr);
+       if (err)
+               return err;
 
        if (is_quota_modification(inode, attr)) {
                err = dquot_initialize(inode);
diff --git a/fs/verity/setup.c b/fs/verity/setup.c
index bc463dc601b1..154556d72691 100644
--- a/fs/verity/setup.c
+++ b/fs/verity/setup.c
@@ -796,7 +796,7 @@ EXPORT_SYMBOL_GPL(fsverity_file_open);
  */
 int fsverity_prepare_setattr(struct dentry *dentry, struct iattr *attr)
 {
-       if (attr->ia_valid & ATTR_SIZE) {
+       if (IS_VERITY(d_inode(dentry)) && (attr->ia_valid & ATTR_SIZE)) {
                pr_debug("Denying truncate of verity file (ino %lu)\n",
                         d_inode(dentry)->i_ino);
                return -EPERM;
diff --git a/include/linux/fsverity.h b/include/linux/fsverity.h
index c770025606e1..9ccc8ad9652a 100644
--- a/include/linux/fsverity.h
+++ b/include/linux/fsverity.h
@@ -69,7 +69,10 @@ static inline int fsverity_file_open(struct inode *inode, 
struct file *filp)
 static inline int fsverity_prepare_setattr(struct dentry *dentry,
                                           struct iattr *attr)
 {
-       return -EOPNOTSUPP;
+       if (IS_VERITY(d_inode(dentry)))
+               return -EOPNOTSUPP;
+
+       return 0;
 }
 
 static inline int fsverity_prepare_getattr(struct inode *inode)
-- 
2.19.1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel