From 460932e7d2cdcf0e80ab222c161b663e84b6a7b4 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Tue, 4 Jun 2013 23:19:29 -0400 Subject: [PATCH] Wrapfs: ->lookup takes flags not a nameidata Signed-off-by: Erez Zadok --- fs/wrapfs/lookup.c | 8 ++++---- fs/wrapfs/wrapfs.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/wrapfs/lookup.c b/fs/wrapfs/lookup.c index 04c036d44e54..fa6e019385c0 100644 --- a/fs/wrapfs/lookup.c +++ b/fs/wrapfs/lookup.c @@ -220,7 +220,8 @@ out: * Returns: NULL (ok), ERR_PTR if an error occurred. * Fills in lower_parent_path with on success. */ -static struct dentry *__wrapfs_lookup(struct dentry *dentry, int flags, +static struct dentry *__wrapfs_lookup(struct dentry *dentry, + unsigned int flags, struct path *lower_parent_path) { int err = 0; @@ -296,13 +297,12 @@ out: } struct dentry *wrapfs_lookup(struct inode *dir, struct dentry *dentry, - struct nameidata *nd) + unsigned int flags) { struct dentry *ret, *parent; struct path lower_parent_path; int err = 0; - BUG_ON(!nd); parent = dget_parent(dentry); wrapfs_get_lower_path(parent, &lower_parent_path); @@ -313,7 +313,7 @@ struct dentry *wrapfs_lookup(struct inode *dir, struct dentry *dentry, ret = ERR_PTR(err); goto out; } - ret = __wrapfs_lookup(dentry, nd->flags, &lower_parent_path); + ret = __wrapfs_lookup(dentry, flags, &lower_parent_path); if (IS_ERR(ret)) goto out; if (ret) diff --git a/fs/wrapfs/wrapfs.h b/fs/wrapfs/wrapfs.h index 91250b3bac32..ed49521f4667 100644 --- a/fs/wrapfs/wrapfs.h +++ b/fs/wrapfs/wrapfs.h @@ -54,7 +54,7 @@ extern int new_dentry_private_data(struct dentry *dentry); extern void free_dentry_private_data(struct dentry *dentry); extern int init_lower_nd(struct nameidata *nd, unsigned int flags); extern struct dentry *wrapfs_lookup(struct inode *dir, struct dentry *dentry, - struct nameidata *nd); + unsigned int flags); extern struct inode *wrapfs_iget(struct super_block *sb, struct inode *lower_inode); extern int wrapfs_interpose(struct dentry *dentry, struct super_block *sb, -- 2.43.0