ext4: fix race between writepages and enabling EXT4_EXTENTS_FL

[linux.git] / fs / overlayfs / util.c

diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index f5678a3f835087e83ad83313a879fb85f1c83a17..ea005085803f0c5a6eb54ae19f8c6b19d2089c38 100644 (file)
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -40,18 +40,6 @@ const struct cred *ovl_override_creds(struct super_block *sb)
        return override_creds(ofs->creator_cred);
 }
 
-struct super_block *ovl_same_sb(struct super_block *sb)
-{
-       struct ovl_fs *ofs = sb->s_fs_info;
-
-       if (!ofs->numlowerfs)
-               return ofs->upper_mnt->mnt_sb;
-       else if (ofs->numlowerfs == 1 && !ofs->upper_mnt)
-               return ofs->lower_fs[0].sb;
-       else
-               return NULL;
-}
-
 /*
  * Check if underlying fs supports file handles and try to determine encoding
  * type, in order to deduce maximum inode number used by fs.
@@ -198,7 +186,7 @@ struct dentry *ovl_dentry_lower(struct dentry *dentry)
        return oe->numlower ? oe->lowerstack[0].dentry : NULL;
 }
 
-struct ovl_layer *ovl_layer_lower(struct dentry *dentry)
+const struct ovl_layer *ovl_layer_lower(struct dentry *dentry)
 {
        struct ovl_entry *oe = dentry->d_fsdata;
 
@@ -576,7 +564,7 @@ int ovl_check_setxattr(struct dentry *dentry, struct dentry *upperdentry,
        err = ovl_do_setxattr(upperdentry, name, value, size, 0);
 
        if (err == -EOPNOTSUPP) {
-               pr_warn("overlayfs: cannot set %s xattr on upper\n", name);
+               pr_warn("cannot set %s xattr on upper\n", name);
                ofs->noxattr = true;
                return xerr;
        }
@@ -700,7 +688,7 @@ static void ovl_cleanup_index(struct dentry *dentry)
 
        inode = d_inode(upperdentry);
        if (!S_ISDIR(inode->i_mode) && inode->i_nlink != 1) {
-               pr_warn_ratelimited("overlayfs: cleanup linked index (%pd2, ino=%lu, nlink=%u)\n",
+               pr_warn_ratelimited("cleanup linked index (%pd2, ino=%lu, nlink=%u)\n",
                                    upperdentry, inode->i_ino, inode->i_nlink);
                /*
                 * We either have a bug with persistent union nlink or a lower
@@ -739,7 +727,7 @@ static void ovl_cleanup_index(struct dentry *dentry)
        return;
 
 fail:
-       pr_err("overlayfs: cleanup index of '%pd2' failed (%i)\n", dentry, err);
+       pr_err("cleanup index of '%pd2' failed (%i)\n", dentry, err);
        goto out;
 }
 
@@ -830,7 +818,7 @@ int ovl_lock_rename_workdir(struct dentry *workdir, struct dentry *upperdir)
 err_unlock:
        unlock_rename(workdir, upperdir);
 err:
-       pr_err("overlayfs: failed to lock workdir+upperdir\n");
+       pr_err("failed to lock workdir+upperdir\n");
        return -EIO;
 }
 
@@ -852,7 +840,7 @@ int ovl_check_metacopy_xattr(struct dentry *dentry)
 
        return 1;
 out:
-       pr_warn_ratelimited("overlayfs: failed to get metacopy (%i)\n", res);
+       pr_warn_ratelimited("failed to get metacopy (%i)\n", res);
        return res;
 }
 
@@ -899,7 +887,7 @@ ssize_t ovl_getxattr(struct dentry *dentry, char *name, char **value,
        return res;
 
 fail:
-       pr_warn_ratelimited("overlayfs: failed to get xattr %s: err=%zi)\n",
+       pr_warn_ratelimited("failed to get xattr %s: err=%zi)\n",
                            name, res);
        kfree(buf);
        return res;
@@ -931,7 +919,7 @@ char *ovl_get_redirect_xattr(struct dentry *dentry, int padding)
 
        return buf;
 invalid:
-       pr_warn_ratelimited("overlayfs: invalid redirect (%s)\n", buf);
+       pr_warn_ratelimited("invalid redirect (%s)\n", buf);
        res = -EINVAL;
        kfree(buf);
        return ERR_PTR(res);