Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] don't pass nameidata to gfs2_lookupi()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2008-07-23 14:42:05 -04:00
parent 2ad94ae654
commit a569c711f6
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/gfs2/inode.c
View file

@ -448,7 +448,7 @@ struct inode *gfs2_lookup_simple(struct inode *dip, const char *name)
struct qstr qstr; struct qstr qstr;
struct inode *inode; struct inode *inode;
gfs2_str2qstr(&qstr, name); gfs2_str2qstr(&qstr, name);
inode = gfs2_lookupi(dip, &qstr, 1, NULL); inode = gfs2_lookupi(dip, &qstr, 1);
/* gfs2_lookupi has inconsistent callers: vfs /* gfs2_lookupi has inconsistent callers: vfs
* related routines expect NULL for no entry found, * related routines expect NULL for no entry found,
* gfs2_lookup_simple callers expect ENOENT * 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, 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 super_block *sb = dir->i_sb;
struct gfs2_inode *dip = GFS2_I(dir); 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; break;
} }
tmp = gfs2_lookupi(dir, &dotdot, 1, NULL); tmp = gfs2_lookupi(dir, &dotdot, 1);
if (IS_ERR(tmp)) { if (IS_ERR(tmp)) {
error = PTR_ERR(tmp); error = PTR_ERR(tmp);
break; break;

2
fs/gfs2/inode.h
View file

@ -83,7 +83,7 @@ int gfs2_inode_refresh(struct gfs2_inode *ip);
int gfs2_dinode_dealloc(struct gfs2_inode *inode); int gfs2_dinode_dealloc(struct gfs2_inode *inode);
int gfs2_change_nlink(struct gfs2_inode *ip, int diff); int gfs2_change_nlink(struct gfs2_inode *ip, int diff);
struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
int is_root, struct nameidata *nd); int is_root);
struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name, struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name,
unsigned int mode, dev_t dev); unsigned int mode, dev_t dev);
int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name, int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name,

2
fs/gfs2/ops_export.c
View file

@ -134,7 +134,7 @@ static struct dentry *gfs2_get_parent(struct dentry *child)
struct dentry *dentry; struct dentry *dentry;
gfs2_str2qstr(&dotdot, ".."); gfs2_str2qstr(&dotdot, "..");
inode = gfs2_lookupi(child->d_inode, &dotdot, 1, NULL); inode = gfs2_lookupi(child->d_inode, &dotdot, 1);
if (!inode) if (!inode)
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);

4
fs/gfs2/ops_inode.c
View file

@ -74,7 +74,7 @@ static int gfs2_create(struct inode *dir, struct dentry *dentry,
return PTR_ERR(inode); return PTR_ERR(inode);
} }
inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd); inode = gfs2_lookupi(dir, &dentry->d_name, 0);
if (inode) { if (inode) {
if (!IS_ERR(inode)) { if (!IS_ERR(inode)) {
gfs2_holder_uninit(ghs); gfs2_holder_uninit(ghs);
@ -109,7 +109,7 @@ static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry,
dentry->d_op = &gfs2_dops; dentry->d_op = &gfs2_dops;
inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd); inode = gfs2_lookupi(dir, &dentry->d_name, 0);
if (inode && IS_ERR(inode)) if (inode && IS_ERR(inode))
return ERR_CAST(inode); return ERR_CAST(inode);

2
fs/gfs2/super.c
View file

@ -389,7 +389,7 @@ int gfs2_jindex_hold(struct gfs2_sbd *sdp, struct gfs2_holder *ji_gh)
break; break;
INIT_LIST_HEAD(&jd->extent_list); INIT_LIST_HEAD(&jd->extent_list);
jd->jd_inode = gfs2_lookupi(sdp->sd_jindex, &name, 1, NULL); jd->jd_inode = gfs2_lookupi(sdp->sd_jindex, &name, 1);
if (!jd->jd_inode || IS_ERR(jd->jd_inode)) { if (!jd->jd_inode || IS_ERR(jd->jd_inode)) {
if (!jd->jd_inode) if (!jd->jd_inode)
error = -ENOENT; error = -ENOENT;