ovl: remove ovl_map_dev_ino() return value
authoryoungjun <her0gyugyu@gmail.com>
Mon, 22 Feb 2021 16:59:21 +0000 (08:59 -0800)
committerMiklos Szeredi <mszeredi@redhat.com>
Mon, 12 Apr 2021 10:00:37 +0000 (12:00 +0200)
ovl_map_dev_ino() always returns success.  Remove unnecessary return value.

Signed-off-by: youngjun <her0gyugyu@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
fs/overlayfs/inode.c

index 003cf83..8f3c79a 100644 (file)
@@ -95,7 +95,7 @@ out:
        return err;
 }
 
-static int ovl_map_dev_ino(struct dentry *dentry, struct kstat *stat, int fsid)
+static void ovl_map_dev_ino(struct dentry *dentry, struct kstat *stat, int fsid)
 {
        bool samefs = ovl_same_fs(dentry->d_sb);
        unsigned int xinobits = ovl_xino_bits(dentry->d_sb);
@@ -108,7 +108,7 @@ static int ovl_map_dev_ino(struct dentry *dentry, struct kstat *stat, int fsid)
                 * which is friendly to du -x.
                 */
                stat->dev = dentry->d_sb->s_dev;
-               return 0;
+               return;
        } else if (xinobits) {
                /*
                 * All inode numbers of underlying fs should not be using the
@@ -122,7 +122,7 @@ static int ovl_map_dev_ino(struct dentry *dentry, struct kstat *stat, int fsid)
                if (likely(!(stat->ino >> xinoshift))) {
                        stat->ino |= ((u64)fsid) << (xinoshift + 1);
                        stat->dev = dentry->d_sb->s_dev;
-                       return 0;
+                       return;
                } else if (ovl_xino_warn(dentry->d_sb)) {
                        pr_warn_ratelimited("inode number too big (%pd2, ino=%llu, xinobits=%d)\n",
                                            dentry, stat->ino, xinobits);
@@ -151,8 +151,6 @@ static int ovl_map_dev_ino(struct dentry *dentry, struct kstat *stat, int fsid)
                 */
                stat->dev = OVL_FS(dentry->d_sb)->fs[fsid].pseudo_dev;
        }
-
-       return 0;
 }
 
 int ovl_getattr(struct user_namespace *mnt_userns, const struct path *path,
@@ -251,9 +249,7 @@ int ovl_getattr(struct user_namespace *mnt_userns, const struct path *path,
                }
        }
 
-       err = ovl_map_dev_ino(dentry, stat, fsid);
-       if (err)
-               goto out;
+       ovl_map_dev_ino(dentry, stat, fsid);
 
        /*
         * It's probably not worth it to count subdirs to get the