mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
Merge branch 'work.lookup' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs lookup() updates from Al Viro: "More conversions of ->lookup() to d_splice_alias(). Should be reasonably complete now - the only leftovers are in ceph" * 'work.lookup' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: afs_try_auto_mntpt(): return NULL instead of ERR_PTR(-ENOENT) afs_lookup(): switch to d_splice_alias() afs: switch dynroot lookups to d_splice_alias() hpfs: fix an inode leak in lookup, switch to d_splice_alias() hostfs_lookup: switch to d_splice_alias()
This commit is contained in:
commit
4d2a073cde
4 changed files with 28 additions and 95 deletions
45
fs/afs/dir.c
45
fs/afs/dir.c
|
@ -822,6 +822,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
|
|||
{
|
||||
struct afs_vnode *dvnode = AFS_FS_I(dir);
|
||||
struct inode *inode;
|
||||
struct dentry *d;
|
||||
struct key *key;
|
||||
int ret;
|
||||
|
||||
|
@ -862,43 +863,17 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
|
|||
|
||||
afs_stat_v(dvnode, n_lookup);
|
||||
inode = afs_do_lookup(dir, dentry, key);
|
||||
if (IS_ERR(inode)) {
|
||||
ret = PTR_ERR(inode);
|
||||
if (ret == -ENOENT) {
|
||||
inode = afs_try_auto_mntpt(dentry, dir);
|
||||
if (!IS_ERR(inode)) {
|
||||
key_put(key);
|
||||
goto success;
|
||||
}
|
||||
|
||||
ret = PTR_ERR(inode);
|
||||
}
|
||||
|
||||
key_put(key);
|
||||
if (ret == -ENOENT) {
|
||||
d_add(dentry, NULL);
|
||||
_leave(" = NULL [negative]");
|
||||
return NULL;
|
||||
}
|
||||
_leave(" = %d [do]", ret);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
dentry->d_fsdata = (void *)(unsigned long)dvnode->status.data_version;
|
||||
|
||||
/* instantiate the dentry */
|
||||
key_put(key);
|
||||
if (IS_ERR(inode)) {
|
||||
_leave(" = %ld", PTR_ERR(inode));
|
||||
return ERR_CAST(inode);
|
||||
if (inode == ERR_PTR(-ENOENT)) {
|
||||
inode = afs_try_auto_mntpt(dentry, dir);
|
||||
} else {
|
||||
dentry->d_fsdata =
|
||||
(void *)(unsigned long)dvnode->status.data_version;
|
||||
}
|
||||
|
||||
success:
|
||||
d_add(dentry, inode);
|
||||
_leave(" = 0 { ino=%lu v=%u }",
|
||||
d_inode(dentry)->i_ino,
|
||||
d_inode(dentry)->i_generation);
|
||||
|
||||
return NULL;
|
||||
d = d_splice_alias(inode, dentry);
|
||||
if (!IS_ERR_OR_NULL(d))
|
||||
d->d_fsdata = dentry->d_fsdata;
|
||||
return d;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -83,7 +83,7 @@ struct inode *afs_try_auto_mntpt(struct dentry *dentry, struct inode *dir)
|
|||
|
||||
out:
|
||||
_leave("= %d", ret);
|
||||
return ERR_PTR(ret);
|
||||
return ret == -ENOENT ? NULL : ERR_PTR(ret);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -141,12 +141,6 @@ static struct dentry *afs_lookup_atcell(struct dentry *dentry)
|
|||
static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentry,
|
||||
unsigned int flags)
|
||||
{
|
||||
struct afs_vnode *vnode;
|
||||
struct inode *inode;
|
||||
int ret;
|
||||
|
||||
vnode = AFS_FS_I(dir);
|
||||
|
||||
_enter("%pd", dentry);
|
||||
|
||||
ASSERTCMP(d_inode(dentry), ==, NULL);
|
||||
|
@ -160,22 +154,7 @@ static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentr
|
|||
memcmp(dentry->d_name.name, "@cell", 5) == 0)
|
||||
return afs_lookup_atcell(dentry);
|
||||
|
||||
inode = afs_try_auto_mntpt(dentry, dir);
|
||||
if (IS_ERR(inode)) {
|
||||
ret = PTR_ERR(inode);
|
||||
if (ret == -ENOENT) {
|
||||
d_add(dentry, NULL);
|
||||
_leave(" = NULL [negative]");
|
||||
return NULL;
|
||||
}
|
||||
_leave(" = %d [do]", ret);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
d_add(dentry, inode);
|
||||
_leave(" = 0 { ino=%lu v=%u }",
|
||||
d_inode(dentry)->i_ino, d_inode(dentry)->i_generation);
|
||||
return NULL;
|
||||
return d_splice_alias(afs_try_auto_mntpt(dentry, dir), dentry);
|
||||
}
|
||||
|
||||
const struct inode_operations afs_dynroot_inode_operations = {
|
||||
|
|
|
@ -610,33 +610,21 @@ static struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry,
|
|||
int err;
|
||||
|
||||
inode = hostfs_iget(ino->i_sb);
|
||||
if (IS_ERR(inode)) {
|
||||
err = PTR_ERR(inode);
|
||||
if (IS_ERR(inode))
|
||||
goto out;
|
||||
}
|
||||
|
||||
err = -ENOMEM;
|
||||
name = dentry_name(dentry);
|
||||
if (name == NULL)
|
||||
goto out_put;
|
||||
|
||||
err = read_name(inode, name);
|
||||
|
||||
__putname(name);
|
||||
if (err == -ENOENT) {
|
||||
iput(inode);
|
||||
inode = NULL;
|
||||
if (name) {
|
||||
err = read_name(inode, name);
|
||||
__putname(name);
|
||||
}
|
||||
if (err) {
|
||||
iput(inode);
|
||||
inode = (err == -ENOENT) ? NULL : ERR_PTR(err);
|
||||
}
|
||||
else if (err)
|
||||
goto out_put;
|
||||
|
||||
d_add(dentry, inode);
|
||||
return NULL;
|
||||
|
||||
out_put:
|
||||
iput(inode);
|
||||
out:
|
||||
return ERR_PTR(err);
|
||||
return d_splice_alias(inode, dentry);
|
||||
}
|
||||
|
||||
static int hostfs_link(struct dentry *to, struct inode *ino,
|
||||
|
|
|
@ -244,6 +244,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, unsigned in
|
|||
result = iget_locked(dir->i_sb, ino);
|
||||
if (!result) {
|
||||
hpfs_error(dir->i_sb, "hpfs_lookup: can't get inode");
|
||||
result = ERR_PTR(-ENOMEM);
|
||||
goto bail1;
|
||||
}
|
||||
if (result->i_state & I_NEW) {
|
||||
|
@ -266,6 +267,8 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, unsigned in
|
|||
|
||||
if (de->has_acl || de->has_xtd_perm) if (!sb_rdonly(dir->i_sb)) {
|
||||
hpfs_error(result->i_sb, "ACLs or XPERM found. This is probably HPFS386. This driver doesn't support it now. Send me some info on these structures");
|
||||
iput(result);
|
||||
result = ERR_PTR(-EINVAL);
|
||||
goto bail1;
|
||||
}
|
||||
|
||||
|
@ -301,29 +304,17 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, unsigned in
|
|||
}
|
||||
}
|
||||
|
||||
bail1:
|
||||
hpfs_brelse4(&qbh);
|
||||
|
||||
/*
|
||||
* Made it.
|
||||
*/
|
||||
|
||||
end:
|
||||
end_add:
|
||||
end:
|
||||
end_add:
|
||||
hpfs_unlock(dir->i_sb);
|
||||
d_add(dentry, result);
|
||||
return NULL;
|
||||
|
||||
/*
|
||||
* Didn't.
|
||||
*/
|
||||
bail1:
|
||||
|
||||
hpfs_brelse4(&qbh);
|
||||
|
||||
/*bail:*/
|
||||
|
||||
hpfs_unlock(dir->i_sb);
|
||||
return ERR_PTR(-ENOENT);
|
||||
return d_splice_alias(result, dentry);
|
||||
}
|
||||
|
||||
const struct file_operations hpfs_dir_ops =
|
||||
|
|
Loading…
Reference in a new issue