diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-07-23 14:42:05 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-07-26 20:53:36 -0400 |
commit | a569c711f63995ad80c23918525111e0cdb0bc73 (patch) | |
tree | 38186f0201614b6b1e71bea0708ef35814825ea6 /fs/gfs2/inode.c | |
parent | 2ad94ae654f5eb72fd3260b706aea645cf4a7791 (diff) |
[PATCH] don't pass nameidata to gfs2_lookupi()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/gfs2/inode.c')
-rw-r--r-- | fs/gfs2/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 6da0ab355b8a..8b0806a32948 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c | |||
@@ -448,7 +448,7 @@ struct inode *gfs2_lookup_simple(struct inode *dip, const char *name) | |||
448 | struct qstr qstr; | 448 | struct qstr qstr; |
449 | struct inode *inode; | 449 | struct inode *inode; |
450 | gfs2_str2qstr(&qstr, name); | 450 | gfs2_str2qstr(&qstr, name); |
451 | inode = gfs2_lookupi(dip, &qstr, 1, NULL); | 451 | inode = gfs2_lookupi(dip, &qstr, 1); |
452 | /* gfs2_lookupi has inconsistent callers: vfs | 452 | /* gfs2_lookupi has inconsistent callers: vfs |
453 | * related routines expect NULL for no entry found, | 453 | * related routines expect NULL for no entry found, |
454 | * gfs2_lookup_simple callers expect ENOENT | 454 | * gfs2_lookup_simple callers expect ENOENT |
@@ -477,7 +477,7 @@ struct inode *gfs2_lookup_simple(struct inode *dip, const char *name) | |||
477 | */ | 477 | */ |
478 | 478 | ||
479 | struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, | 479 | struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, |
480 | int is_root, struct nameidata *nd) | 480 | int is_root) |
481 | { | 481 | { |
482 | struct super_block *sb = dir->i_sb; | 482 | struct super_block *sb = dir->i_sb; |
483 | struct gfs2_inode *dip = GFS2_I(dir); | 483 | struct gfs2_inode *dip = GFS2_I(dir); |
@@ -1173,7 +1173,7 @@ int gfs2_ok_to_move(struct gfs2_inode *this, struct gfs2_inode *to) | |||
1173 | break; | 1173 | break; |
1174 | } | 1174 | } |
1175 | 1175 | ||
1176 | tmp = gfs2_lookupi(dir, &dotdot, 1, NULL); | 1176 | tmp = gfs2_lookupi(dir, &dotdot, 1); |
1177 | if (IS_ERR(tmp)) { | 1177 | if (IS_ERR(tmp)) { |
1178 | error = PTR_ERR(tmp); | 1178 | error = PTR_ERR(tmp); |
1179 | break; | 1179 | break; |