[PATCH] don't pass nameidata to gfs2_lookupi()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@ -448,7 +448,7 @@ struct inode *gfs2_lookup_simple(struct inode *dip, const char *name)
|
||||
struct qstr qstr;
|
||||
struct inode *inode;
|
||||
gfs2_str2qstr(&qstr, name);
|
||||
inode = gfs2_lookupi(dip, &qstr, 1, NULL);
|
||||
inode = gfs2_lookupi(dip, &qstr, 1);
|
||||
/* gfs2_lookupi has inconsistent callers: vfs
|
||||
* related routines expect NULL for no entry found,
|
||||
* gfs2_lookup_simple callers expect ENOENT
|
||||
@ -477,7 +477,7 @@ struct inode *gfs2_lookup_simple(struct inode *dip, const char *name)
|
||||
*/
|
||||
|
||||
struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
|
||||
int is_root, struct nameidata *nd)
|
||||
int is_root)
|
||||
{
|
||||
struct super_block *sb = dir->i_sb;
|
||||
struct gfs2_inode *dip = GFS2_I(dir);
|
||||
@ -1173,7 +1173,7 @@ int gfs2_ok_to_move(struct gfs2_inode *this, struct gfs2_inode *to)
|
||||
break;
|
||||
}
|
||||
|
||||
tmp = gfs2_lookupi(dir, &dotdot, 1, NULL);
|
||||
tmp = gfs2_lookupi(dir, &dotdot, 1);
|
||||
if (IS_ERR(tmp)) {
|
||||
error = PTR_ERR(tmp);
|
||||
break;
|
||||
|
Reference in New Issue
Block a user