On Tue, Jul 09, 2013 at 09:16:17AM -0400, Jeff Layton wrote: > On Wed, 3 Jul 2013 16:12:35 -0400 > "J. Bruce Fields" <bfields@xxxxxxxxxx> wrote: > > > From: "J. Bruce Fields" <bfields@xxxxxxxxxx> > > > > Cc: Tyler Hicks <tyhicks@xxxxxxxxxxxxx> > > Cc: Dustin Kirkland <dustin.kirkland@xxxxxxxxxxx> > > Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx> > > --- > > fs/ecryptfs/inode.c | 2 +- > > fs/namei.c | 17 +++++++++++++---- > > fs/nfsd/vfs.c | 2 +- > > include/linux/fs.h | 2 +- > > 4 files changed, 16 insertions(+), 7 deletions(-) > > > > diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c > > index af42d88..19e4435 100644 > > --- a/fs/ecryptfs/inode.c > > +++ b/fs/ecryptfs/inode.c > > @@ -475,7 +475,7 @@ static int ecryptfs_link(struct dentry *old_dentry, struct inode *dir, > > dget(lower_new_dentry); > > lower_dir_dentry = lock_parent(lower_new_dentry); > > rc = vfs_link(lower_old_dentry, lower_dir_dentry->d_inode, > > - lower_new_dentry); > > + lower_new_dentry, NULL); > > if (rc || !lower_new_dentry->d_inode) > > goto out_lock; > > rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir->i_sb); > > diff --git a/fs/namei.c b/fs/namei.c > > index be00d37..18267e0 100644 > > --- a/fs/namei.c > > +++ b/fs/namei.c > > @@ -3566,7 +3566,7 @@ SYSCALL_DEFINE2(symlink, const char __user *, oldname, const char __user *, newn > > return sys_symlinkat(oldname, AT_FDCWD, newname); > > } > > > > -int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_dentry) > > +int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_dentry, struct inode **delegated_inode) > > A kerneldoc comment would be nice here. Ditto for vfs_rename* in the > previous patch... OK, done locally, using modified versions of the comment for unlink. I'll resend the series soon. --b. -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
