diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-15 17:00:11 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-15 17:00:11 +0300 |
| commit | c182ce9bc8c85a623c71a23bcd6768045126c289 (patch) | |
| tree | 73fb6561bbec5d89cba74492c149f3012e275afa /fs/afs/inode.c | |
| parent | 2da050e4f151c458df909780843067e7c2d11ec2 (diff) | |
| parent | a8750ddca918032d6349adbf9a4b6555e7db20da (diff) | |
| download | linux-c182ce9bc8c85a623c71a23bcd6768045126c289.tar.xz | |
Merge 4.15-rc8 into usb-next
We want the USB fixes in here as well for merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/afs/inode.c')
| -rw-r--r-- | fs/afs/inode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/afs/inode.c b/fs/afs/inode.c index 3415eb7484f6..1e81864ef0b2 100644 --- a/fs/afs/inode.c +++ b/fs/afs/inode.c @@ -377,6 +377,10 @@ int afs_validate(struct afs_vnode *vnode, struct key *key) } read_sequnlock_excl(&vnode->cb_lock); + + if (test_bit(AFS_VNODE_DELETED, &vnode->flags)) + clear_nlink(&vnode->vfs_inode); + if (valid) goto valid; |