diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 22:05:38 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 22:05:38 +0200 |
commit | a7204d72db251784808b0c050220992d7f833a2c (patch) | |
tree | 3491452ea74b039f3278fd95bb7ad7c88b6b3631 /fs/afs/dir.c | |
parent | i2o: convert bus code to use dev_groups (diff) | |
parent | Linux 3.12-rc6 (diff) | |
download | linux-a7204d72db251784808b0c050220992d7f833a2c.tar.xz linux-a7204d72db251784808b0c050220992d7f833a2c.zip |
Merge 3.12-rc6 into driver-core-next
We want these fixes here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/afs/dir.c')
-rw-r--r-- | fs/afs/dir.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/afs/dir.c b/fs/afs/dir.c index 646337dc5201..529300327f45 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c @@ -600,9 +600,6 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) /* lock down the parent dentry so we can peer at it */ parent = dget_parent(dentry); - if (!parent->d_inode) - goto out_bad; - dir = AFS_FS_I(parent->d_inode); /* validate the parent directory */ |