aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2017-05-19 03:33:49 -0400
committerMiklos Szeredi <mszeredi@redhat.com>2017-05-19 03:33:49 -0400
commit3d27573ce32b47ba54e6680c77c26a700d67cc16 (patch)
tree2d44e81e0ae7d167233bf58a7638e1f076333c07
parent21a228781104ae6fed7e720137ab024575071feb (diff)
ovl: remove unused arg from ovl_lookup_temp()
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
-rw-r--r--fs/overlayfs/copy_up.c2
-rw-r--r--fs/overlayfs/dir.c8
-rw-r--r--fs/overlayfs/overlayfs.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index f92ab35d43a6..843ed2a2d7db 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -346,7 +346,7 @@ static int ovl_copy_up_locked(struct dentry *workdir, struct dentry *upperdir,
346 if (tmpfile) 346 if (tmpfile)
347 temp = ovl_do_tmpfile(upperdir, stat->mode); 347 temp = ovl_do_tmpfile(upperdir, stat->mode);
348 else 348 else
349 temp = ovl_lookup_temp(workdir, dentry); 349 temp = ovl_lookup_temp(workdir);
350 err = 0; 350 err = 0;
351 if (IS_ERR(temp)) { 351 if (IS_ERR(temp)) {
352 err = PTR_ERR(temp); 352 err = PTR_ERR(temp);
diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 80e0e202a346..369ee7c4cdc0 100644
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -41,7 +41,7 @@ void ovl_cleanup(struct inode *wdir, struct dentry *wdentry)
41 } 41 }
42} 42}
43 43
44struct dentry *ovl_lookup_temp(struct dentry *workdir, struct dentry *dentry) 44struct dentry *ovl_lookup_temp(struct dentry *workdir)
45{ 45{
46 struct dentry *temp; 46 struct dentry *temp;
47 char name[20]; 47 char name[20];
@@ -68,7 +68,7 @@ static struct dentry *ovl_whiteout(struct dentry *workdir,
68 struct dentry *whiteout; 68 struct dentry *whiteout;
69 struct inode *wdir = workdir->d_inode; 69 struct inode *wdir = workdir->d_inode;
70 70
71 whiteout = ovl_lookup_temp(workdir, dentry); 71 whiteout = ovl_lookup_temp(workdir);
72 if (IS_ERR(whiteout)) 72 if (IS_ERR(whiteout))
73 return whiteout; 73 return whiteout;
74 74
@@ -261,7 +261,7 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry,
261 if (upper->d_parent->d_inode != udir) 261 if (upper->d_parent->d_inode != udir)
262 goto out_unlock; 262 goto out_unlock;
263 263
264 opaquedir = ovl_lookup_temp(workdir, dentry); 264 opaquedir = ovl_lookup_temp(workdir);
265 err = PTR_ERR(opaquedir); 265 err = PTR_ERR(opaquedir);
266 if (IS_ERR(opaquedir)) 266 if (IS_ERR(opaquedir))
267 goto out_unlock; 267 goto out_unlock;
@@ -393,7 +393,7 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode,
393 if (err) 393 if (err)
394 goto out; 394 goto out;
395 395
396 newdentry = ovl_lookup_temp(workdir, dentry); 396 newdentry = ovl_lookup_temp(workdir);
397 err = PTR_ERR(newdentry); 397 err = PTR_ERR(newdentry);
398 if (IS_ERR(newdentry)) 398 if (IS_ERR(newdentry))
399 goto out_unlock; 399 goto out_unlock;
diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index 505b18b56330..7c56932bfc2f 100644
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -262,7 +262,7 @@ static inline void ovl_copyattr(struct inode *from, struct inode *to)
262 262
263/* dir.c */ 263/* dir.c */
264extern const struct inode_operations ovl_dir_inode_operations; 264extern const struct inode_operations ovl_dir_inode_operations;
265struct dentry *ovl_lookup_temp(struct dentry *workdir, struct dentry *dentry); 265struct dentry *ovl_lookup_temp(struct dentry *workdir);
266struct cattr { 266struct cattr {
267 dev_t rdev; 267 dev_t rdev;
268 umode_t mode; 268 umode_t mode;