more d_splice_alias() in ->lookup() instances
Subsystems (4)
Al Viro
maintainerPATCH 1/1 more d_splice_alias() in ->lookup() instances
From: Al Viro <[email protected]>
In the spirit of "thou shalt not push into your tree without at least posting for review"...
* hostfs conversion of ->lookup() to use of d_splice_alias()
* afs conversions of ->lookup() to use of d_splice_alias()
* hpfs conversion of ->lookup() to use of d_splice_alias(), leak fix on failure exit.
Stuff is in vfs.git#work.lookup, to go into #for-next if nobody yells.
Al Viro
maintainerPATCH 1/5 hostfs_lookup: switch to d_splice_alias()
From: Al Viro <[email protected]>
--- fs/hostfs/hostfs_kern.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)
fs/hostfs/hostfs_kern.c +8 -20
@@ -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 ) { +if (name) { + err =read_name (inode, name); +__putname (name); + } +if (err) {iput (inode); - inode =NULL ; + 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,
Signature · 1 line
2.11.0
Al Viro
maintainerPATCH 2/5 afs: switch dynroot lookups to d_splice_alias()
In reply to Al ViroFrom: Al Viro <[email protected]>
--- fs/afs/dynroot.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
fs/afs/dynroot.c +3 -15
@@ -143,7 +143,6 @@ static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentr {struct afs_vnode *vnode;struct inode *inode; -int ret; vnode =AFS_FS_I (dir);
@@ -161,21 +160,10 @@ static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentrreturn 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); - } +if (inode ==ERR_PTR (-ENOENT )) + inode =NULL ; -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 (inode, dentry); }const struct inode_operations afs_dynroot_inode_operations = {
Signature · 1 line
2.11.0
Al Viro
maintainerPATCH 3/5 afs_lookup(): switch to d_splice_alias()
In reply to Al ViroFrom: Al Viro <[email protected]>
--- fs/afs/dir.c | 47 ++++++++++++----------------------------------- 1 file changed, 12 insertions(+), 35 deletions(-)
fs/afs/dir.c +12 -35
@@ -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,19 @@ 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); +if (inode ==ERR_PTR (-ENOENT )) { + inode =afs_try_auto_mntpt (dentry, dir); +if (inode ==ERR_PTR (-ENOENT )) + inode =NULL ; + }else { + dentry->d_fsdata = + (void *)(unsigned long )dvnode->status.data_version; } - 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); - } - -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; }/*
Signature · 1 line
2.11.0
Al Viro
maintainerPATCH 4/5 afs_try_auto_mntpt(): return NULL instead of ERR_PTR(-ENOENT)
In reply to Al ViroFrom: Al Viro <[email protected]>
simpler logics in callers that way
--- fs/afs/dir.c | 2 -- fs/afs/dynroot.c | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-)
fs/afs/dir.c +0 -2
@@ -865,8 +865,6 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry, inode =afs_do_lookup (dir, dentry, key);if (inode ==ERR_PTR (-ENOENT )) { inode =afs_try_auto_mntpt (dentry, dir); -if (inode ==ERR_PTR (-ENOENT )) - inode =NULL ; }else { dentry->d_fsdata = (void *)(unsigned long )dvnode->status.data_version;
fs/afs/dynroot.c +1 -4
@@ -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); }/*
@@ -160,9 +160,6 @@ static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentrreturn afs_lookup_atcell (dentry); inode =afs_try_auto_mntpt (dentry, dir); -if (inode ==ERR_PTR (-ENOENT )) - inode =NULL ; -return d_splice_alias (inode, dentry); }
Signature · 1 line
2.11.0
Al Viro
maintainerPATCH 5/5 hpfs: fix an inode leak in lookup, switch to d_splice_alias()
In reply to Al ViroFrom: Al Viro <[email protected]>
--- fs/hpfs/dir.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
fs/hpfs/dir.c +7 -16
@@ -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 inif (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 =
Signature · 1 line
2.11.0