ovl: remove ovl_map_dev_ino return value
PATCH 1/1 ovl: remove ovl_map_dev_ino return value
ovl_map_dev_ino always return success.
remove unnecessary return value.
Signed-off-by youngjun <[email protected]>
--- fs/overlayfs/inode.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
fs/overlayfs/inode.c +4 -8
@@ -94,7 +94,7 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr)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);
@@ -107,7 +107,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
@@ -121,7 +121,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);
@@ -150,8 +150,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(const struct path *path, struct kstat *stat,
@@ -250,9 +248,7 @@ int ovl_getattr(const struct path *path, struct kstat *stat, } } - 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
Signature · 1 line
2.17.1
Quoted 3 lines · youngjun
ovl_map_dev_inoalways return success.
remove unnecessary return value.
Thanks, applied.
Miklos