diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-14 09:56:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-14 09:56:31 -0800 |
| commit | e033e7d4a8081852b2cca53e530e2c0f4e6769c0 (patch) | |
| tree | a396fbd9164da534f3b45e8ca95d942c5da78099 /fs/afs | |
| parent | 3f1f9a9b715cfa5d9933a024807e32b206775f83 (diff) | |
| parent | f52b83b0b1c40ada38df917973ab719a4a753951 (diff) | |
| download | linux-e033e7d4a8081852b2cca53e530e2c0f4e6769c0.tar.gz linux-e033e7d4a8081852b2cca53e530e2c0f4e6769c0.tar.bz2 linux-e033e7d4a8081852b2cca53e530e2c0f4e6769c0.zip | |
Merge branch 'dhowells' (patches from DavidH)
Merge misc fixes from David Howells.
Two afs fixes and a key refcounting fix.
* dhowells:
afs: Fix afs_lookup() to not clobber the version on a new dentry
afs: Fix use-after-loss-of-ref
keys: Fix request_key() cache
Diffstat (limited to 'fs/afs')
| -rw-r--r-- | fs/afs/dir.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/fs/afs/dir.c b/fs/afs/dir.c index 497f979018c2..5c794f4b051a 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c @@ -908,6 +908,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) { struct afs_vnode *dvnode = AFS_FS_I(dir); + struct afs_fid fid = {}; struct inode *inode; struct dentry *d; struct key *key; @@ -951,21 +952,18 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry, afs_stat_v(dvnode, n_lookup); inode = afs_do_lookup(dir, dentry, key); key_put(key); - if (inode == ERR_PTR(-ENOENT)) { + if (inode == ERR_PTR(-ENOENT)) inode = afs_try_auto_mntpt(dentry, dir); - } else { - dentry->d_fsdata = - (void *)(unsigned long)dvnode->status.data_version; - } + + if (!IS_ERR_OR_NULL(inode)) + fid = AFS_FS_I(inode)->fid; + d = d_splice_alias(inode, dentry); if (!IS_ERR_OR_NULL(d)) { d->d_fsdata = dentry->d_fsdata; - trace_afs_lookup(dvnode, &d->d_name, - inode ? AFS_FS_I(inode) : NULL); + trace_afs_lookup(dvnode, &d->d_name, &fid); } else { - trace_afs_lookup(dvnode, &dentry->d_name, - IS_ERR_OR_NULL(inode) ? NULL - : AFS_FS_I(inode)); + trace_afs_lookup(dvnode, &dentry->d_name, &fid); } return d; } |