From 89b7bfc0fcf27a81c894988b4080692a412cfee9 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Mon, 28 Jul 2008 00:04:00 -0400 Subject: [PATCH] Unionfs: symlink no longer takes a mode parameter Signed-off-by: Erez Zadok --- 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 bbd49c83b0e..ae6ea2bea30 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 a05b412aa1d..1a95e3bc8fc 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 e6f15a03aba..dd45e39ca7c 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 e072bf70ec3..679a0dfa978 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 { -- 2.34.1