Commit 1bd0a3ae authored by lijiazi's avatar lijiazi Committed by Miklos Szeredi
Browse files

ovl: use pr_fmt auto generate prefix 



Use pr_fmt auto generate "overlayfs: " prefix.

Signed-off-by: default avatarlijiazi <lijiazi@xiaomi.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 4c37e71b

fs/overlayfs/copy_up.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


static int ovl_ccup_set(const char *buf, const struct kernel_param *param)

{

	pr_warn("overlayfs: \"check_copy_up\" module option is obsolete\n");

	pr_warn("\"check_copy_up\" module option is obsolete\n");

	return 0;

}

fs/overlayfs/dir.c

+5 −5
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ int ovl_cleanup(struct inode *wdir, struct dentry *wdentry) 
	dput(wdentry);



	if (err) {

		pr_err("overlayfs: cleanup of '%pd2' failed (%i)\n",

		pr_err("cleanup of '%pd2' failed (%i)\n",

		       wdentry, err);

	}
@@ -53,7 +53,7 @@ static struct dentry *ovl_lookup_temp(struct dentry *workdir) 


	temp = lookup_one_len(name, workdir, strlen(name));

	if (!IS_ERR(temp) && temp->d_inode) {

		pr_err("overlayfs: workdir/%s already exists\n", name);

		pr_err("workdir/%s already exists\n", name);

		dput(temp);

		temp = ERR_PTR(-EIO);

	}
@@ -134,7 +134,7 @@ static int ovl_mkdir_real(struct inode *dir, struct dentry **newdentry, 
	d = lookup_one_len(dentry->d_name.name, dentry->d_parent,

			   dentry->d_name.len);

	if (IS_ERR(d)) {

		pr_warn("overlayfs: failed lookup after mkdir (%pd2, err=%i).\n",

		pr_warn("failed lookup after mkdir (%pd2, err=%i).\n",

			dentry, err);

		return PTR_ERR(d);

	}
@@ -267,7 +267,7 @@ static int ovl_instantiate(struct dentry *dentry, struct inode *inode, 


	d_instantiate(dentry, inode);

	if (inode != oip.newinode) {

		pr_warn_ratelimited("overlayfs: newly created inode found in cache (%pd2)\n",

		pr_warn_ratelimited("newly created inode found in cache (%pd2)\n",

				    dentry);

	}
@@ -1009,7 +1009,7 @@ static int ovl_set_redirect(struct dentry *dentry, bool samedir) 
		spin_unlock(&dentry->d_lock);

	} else {

		kfree(redirect);

		pr_warn_ratelimited("overlayfs: failed to set redirect (%i)\n",

		pr_warn_ratelimited("failed to set redirect (%i)\n",

				    err);

		/* Fall back to userspace copy-up */

		err = -EXDEV;

fs/overlayfs/export.c

+6 −6
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int ovl_encode_maybe_copy_up(struct dentry *dentry) 
	}



	if (err) {

		pr_warn_ratelimited("overlayfs: failed to copy up on encode (%pd2, err=%i)\n",

		pr_warn_ratelimited("failed to copy up on encode (%pd2, err=%i)\n",

				    dentry, err);

	}
@@ -244,7 +244,7 @@ static int ovl_dentry_to_fid(struct dentry *dentry, u32 *fid, int buflen) 
	return err;



fail:

	pr_warn_ratelimited("overlayfs: failed to encode file handle (%pd2, err=%i, buflen=%d, len=%d, type=%d)\n",

	pr_warn_ratelimited("failed to encode file handle (%pd2, err=%i, buflen=%d, len=%d, type=%d)\n",

			    dentry, err, buflen, fh ? (int)fh->fb.len : 0,

			    fh ? fh->fb.type : 0);

	goto out;
@@ -406,7 +406,7 @@ static struct dentry *ovl_lookup_real_one(struct dentry *connected, 
	return this;



fail:

	pr_warn_ratelimited("overlayfs: failed to lookup one by real (%pd2, layer=%d, connected=%pd2, err=%i)\n",

	pr_warn_ratelimited("failed to lookup one by real (%pd2, layer=%d, connected=%pd2, err=%i)\n",

			    real, layer->idx, connected, err);

	this = ERR_PTR(err);

	goto out;
@@ -631,7 +631,7 @@ static struct dentry *ovl_lookup_real(struct super_block *sb, 
	return connected;



fail:

	pr_warn_ratelimited("overlayfs: failed to lookup by real (%pd2, layer=%d, connected=%pd2, err=%i)\n",

	pr_warn_ratelimited("failed to lookup by real (%pd2, layer=%d, connected=%pd2, err=%i)\n",

			    real, layer->idx, connected, err);

	dput(connected);

	return ERR_PTR(err);
@@ -822,7 +822,7 @@ static struct dentry *ovl_fh_to_dentry(struct super_block *sb, struct fid *fid, 
	return dentry;



out_err:

	pr_warn_ratelimited("overlayfs: failed to decode file handle (len=%d, type=%d, flags=%x, err=%i)\n",

	pr_warn_ratelimited("failed to decode file handle (len=%d, type=%d, flags=%x, err=%i)\n",

			    fh_len, fh_type, flags, err);

	dentry = ERR_PTR(err);

	goto out;
@@ -831,7 +831,7 @@ static struct dentry *ovl_fh_to_dentry(struct super_block *sb, struct fid *fid, 
static struct dentry *ovl_fh_to_parent(struct super_block *sb, struct fid *fid,

				       int fh_len, int fh_type)

{

	pr_warn_ratelimited("overlayfs: connectable file handles not supported; use 'no_subtree_check' exportfs option.\n");

	pr_warn_ratelimited("connectable file handles not supported; use 'no_subtree_check' exportfs option.\n");

	return ERR_PTR(-EACCES);

}

fs/overlayfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int ovl_map_dev_ino(struct dentry *dentry, struct kstat *stat, 
		 * persistent for a given layer configuration.

		 */

		if (stat->ino >> shift) {

			pr_warn_ratelimited("overlayfs: inode number too big (%pd2, ino=%llu, xinobits=%d)\n",

			pr_warn_ratelimited("inode number too big (%pd2, ino=%llu, xinobits=%d)\n",

					    dentry, stat->ino, xinobits);

		} else {

			if (lower_layer)
@@ -698,7 +698,7 @@ unsigned int ovl_get_nlink(struct dentry *lowerdentry, 
	return nlink;



fail:

	pr_warn_ratelimited("overlayfs: failed to get index nlink (%pd2, err=%i)\n",

	pr_warn_ratelimited("failed to get index nlink (%pd2, err=%i)\n",

			    upperdentry, err);

	return fallback;

}
@@ -969,7 +969,7 @@ struct inode *ovl_get_inode(struct super_block *sb, 
	return inode;



out_err:

	pr_warn_ratelimited("overlayfs: failed to get inode (%i)\n", err);

	pr_warn_ratelimited("failed to get inode (%i)\n", err);

	inode = ERR_PTR(err);

	goto out;

}

fs/overlayfs/namei.c

+13 −13
Original line number Diff line number Diff line
@@ -141,10 +141,10 @@ static struct ovl_fh *ovl_get_fh(struct dentry *dentry, const char *name) 
	return NULL;



fail:

	pr_warn_ratelimited("overlayfs: failed to get origin (%i)\n", res);

	pr_warn_ratelimited("failed to get origin (%i)\n", res);

	goto out;

invalid:

	pr_warn_ratelimited("overlayfs: invalid origin (%*phN)\n", res, fh);

	pr_warn_ratelimited("invalid origin (%*phN)\n", res, fh);

	goto out;

}
@@ -360,7 +360,7 @@ int ovl_check_origin_fh(struct ovl_fs *ofs, struct ovl_fh *fh, bool connected, 
	return 0;



invalid:

	pr_warn_ratelimited("overlayfs: invalid origin (%pd2, ftype=%x, origin ftype=%x).\n",

	pr_warn_ratelimited("invalid origin (%pd2, ftype=%x, origin ftype=%x).\n",

			    upperdentry, d_inode(upperdentry)->i_mode & S_IFMT,

			    d_inode(origin)->i_mode & S_IFMT);

	dput(origin);
@@ -449,7 +449,7 @@ int ovl_verify_set_fh(struct dentry *dentry, const char *name, 


fail:

	inode = d_inode(real);

	pr_warn_ratelimited("overlayfs: failed to verify %s (%pd2, ino=%lu, err=%i)\n",

	pr_warn_ratelimited("failed to verify %s (%pd2, ino=%lu, err=%i)\n",

			    is_upper ? "upper" : "origin", real,

			    inode ? inode->i_ino : 0, err);

	goto out;
@@ -475,7 +475,7 @@ struct dentry *ovl_index_upper(struct ovl_fs *ofs, struct dentry *index) 
		return upper ?: ERR_PTR(-ESTALE);



	if (!d_is_dir(upper)) {

		pr_warn_ratelimited("overlayfs: invalid index upper (%pd2, upper=%pd2).\n",

		pr_warn_ratelimited("invalid index upper (%pd2, upper=%pd2).\n",

				    index, upper);

		dput(upper);

		return ERR_PTR(-EIO);
@@ -589,12 +589,12 @@ int ovl_verify_index(struct ovl_fs *ofs, struct dentry *index) 
	return err;



fail:

	pr_warn_ratelimited("overlayfs: failed to verify index (%pd2, ftype=%x, err=%i)\n",

	pr_warn_ratelimited("failed to verify index (%pd2, ftype=%x, err=%i)\n",

			    index, d_inode(index)->i_mode & S_IFMT, err);

	goto out;



orphan:

	pr_warn_ratelimited("overlayfs: orphan index entry (%pd2, ftype=%x, nlink=%u)\n",

	pr_warn_ratelimited("orphan index entry (%pd2, ftype=%x, nlink=%u)\n",

			    index, d_inode(index)->i_mode & S_IFMT,

			    d_inode(index)->i_nlink);

	err = -ENOENT;
@@ -696,7 +696,7 @@ struct dentry *ovl_lookup_index(struct ovl_fs *ofs, struct dentry *upper, 
			index = NULL;

			goto out;

		}

		pr_warn_ratelimited("overlayfs: failed inode index lookup (ino=%lu, key=%.*s, err=%i);\n"

		pr_warn_ratelimited("failed inode index lookup (ino=%lu, key=%.*s, err=%i);\n"

				    "overlayfs: mount with '-o index=off' to disable inodes index.\n",

				    d_inode(origin)->i_ino, name.len, name.name,

				    err);
@@ -723,13 +723,13 @@ struct dentry *ovl_lookup_index(struct ovl_fs *ofs, struct dentry *upper, 
		 * unlinked, which means that finding a lower origin on lookup

		 * whose index is a whiteout should be treated as an error.

		 */

		pr_warn_ratelimited("overlayfs: bad index found (index=%pd2, ftype=%x, origin ftype=%x).\n",

		pr_warn_ratelimited("bad index found (index=%pd2, ftype=%x, origin ftype=%x).\n",

				    index, d_inode(index)->i_mode & S_IFMT,

				    d_inode(origin)->i_mode & S_IFMT);

		goto fail;

	} else if (is_dir && verify) {

		if (!upper) {

			pr_warn_ratelimited("overlayfs: suspected uncovered redirected dir found (origin=%pd2, index=%pd2).\n",

			pr_warn_ratelimited("suspected uncovered redirected dir found (origin=%pd2, index=%pd2).\n",

					    origin, index);

			goto fail;

		}
@@ -738,7 +738,7 @@ struct dentry *ovl_lookup_index(struct ovl_fs *ofs, struct dentry *upper, 
		err = ovl_verify_upper(index, upper, false);

		if (err) {

			if (err == -ESTALE) {

				pr_warn_ratelimited("overlayfs: suspected multiply redirected dir found (upper=%pd2, origin=%pd2, index=%pd2).\n",

				pr_warn_ratelimited("suspected multiply redirected dir found (upper=%pd2, origin=%pd2, index=%pd2).\n",

						    upper, origin, index);

			}

			goto fail;
@@ -967,7 +967,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, 
		 */

		err = -EPERM;

		if (d.redirect && !ofs->config.redirect_follow) {

			pr_warn_ratelimited("overlayfs: refusing to follow redirect for (%pd2)\n",

			pr_warn_ratelimited("refusing to follow redirect for (%pd2)\n",

					    dentry);

			goto out_put;

		}
@@ -994,7 +994,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, 


		err = -EPERM;

		if (!ofs->config.metacopy) {

			pr_warn_ratelimited("overlay: refusing to follow metacopy origin for (%pd2)\n",

			pr_warn_ratelimited("refusing to follow metacopy origin for (%pd2)\n",

					    dentry);

			goto out_put;

		}