Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d27573c authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

ovl: remove unused arg from ovl_lookup_temp() 



Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 21a22878

fs/overlayfs/copy_up.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int ovl_copy_up_locked(struct dentry *workdir, struct dentry *upperdir, 
	if (tmpfile)

		temp = ovl_do_tmpfile(upperdir, stat->mode);

	else

		temp = ovl_lookup_temp(workdir, dentry);

		temp = ovl_lookup_temp(workdir);

	err = 0;

	if (IS_ERR(temp)) {

		err = PTR_ERR(temp);

fs/overlayfs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ void ovl_cleanup(struct inode *wdir, struct dentry *wdentry) 
	}

}



struct dentry *ovl_lookup_temp(struct dentry *workdir, struct dentry *dentry)

struct dentry *ovl_lookup_temp(struct dentry *workdir)

{

	struct dentry *temp;

	char name[20];
@@ -68,7 +68,7 @@ static struct dentry *ovl_whiteout(struct dentry *workdir, 
	struct dentry *whiteout;

	struct inode *wdir = workdir->d_inode;



	whiteout = ovl_lookup_temp(workdir, dentry);

	whiteout = ovl_lookup_temp(workdir);

	if (IS_ERR(whiteout))

		return whiteout;
@@ -261,7 +261,7 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry, 
	if (upper->d_parent->d_inode != udir)

		goto out_unlock;



	opaquedir = ovl_lookup_temp(workdir, dentry);

	opaquedir = ovl_lookup_temp(workdir);

	err = PTR_ERR(opaquedir);

	if (IS_ERR(opaquedir))

		goto out_unlock;
@@ -393,7 +393,7 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode, 
	if (err)

		goto out;



	newdentry = ovl_lookup_temp(workdir, dentry);

	newdentry = ovl_lookup_temp(workdir);

	err = PTR_ERR(newdentry);

	if (IS_ERR(newdentry))

		goto out_unlock;

fs/overlayfs/overlayfs.h

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static inline void ovl_copyattr(struct inode *from, struct inode *to) 


/* dir.c */

extern const struct inode_operations ovl_dir_inode_operations;

struct dentry *ovl_lookup_temp(struct dentry *workdir, struct dentry *dentry);

struct dentry *ovl_lookup_temp(struct dentry *workdir);

struct cattr {

	dev_t rdev;

	umode_t mode;