Signed-off-by: Erez Zadok <ezk@xxxxxxxxxxxxx>
---
fs/unionfs/copyup.c | 1 -
fs/unionfs/inode.c | 3 +--
fs/unionfs/sioq.c | 2 +-
fs/unionfs/sioq.h | 1 -
4 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index bbd49c8..ae6ea2b 100644
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -184,7 +184,6 @@ static int __copyup_ndentry(struct dentry *old_lower_dentry,
args.symlink.parent = new_lower_parent_dentry->d_inode;
args.symlink.dentry = new_lower_dentry;
args.symlink.symbuf = symbuf;
- args.symlink.mode = old_mode;
run_sioq(__unionfs_symlink, &args);
err = args.err;
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index a05b412..1a95e3b 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -412,8 +412,7 @@ static int unionfs_symlink(struct inode *parent, struct dentry *dentry,
}
mode = S_IALLUGO;
- err = vfs_symlink(lower_parent_dentry->d_inode, lower_dentry,
- symname, mode);
+ err = vfs_symlink(lower_parent_dentry->d_inode, lower_dentry, symname);
if (!err) {
err = PTR_ERR(unionfs_interpose(dentry, parent->i_sb, 0));
if (!err) {
diff --git a/fs/unionfs/sioq.c b/fs/unionfs/sioq.c
index e6f15a0..dd45e39 100644
--- a/fs/unionfs/sioq.c
+++ b/fs/unionfs/sioq.c
@@ -87,7 +87,7 @@ void __unionfs_symlink(struct work_struct *work)
struct sioq_args *args = container_of(work, struct sioq_args, work);
struct symlink_args *s = &args->symlink;
- args->err = vfs_symlink(s->parent, s->dentry, s->symbuf, s->mode);
+ args->err = vfs_symlink(s->parent, s->dentry, s->symbuf);
complete(&args->comp);
}
diff --git a/fs/unionfs/sioq.h b/fs/unionfs/sioq.h
index e072bf7..679a0df 100644
--- a/fs/unionfs/sioq.h
+++ b/fs/unionfs/sioq.h
@@ -49,7 +49,6 @@ struct symlink_args {
struct inode *parent;
struct dentry *dentry;
char *symbuf;
- umode_t mode;
};
struct unlink_args {
--
1.5.2.2
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
