Skip to content

Commit

Permalink
orangefs: reverse sense of is-inode-stale test in d_revalidate
Browse files Browse the repository at this point in the history
If a dentry is deleted, then a dentry is recreated with the same handle
but a different type (i.e. it was a file and now it's a symlink), then
its a different inode.  The check was backwards, so d_revalidate would
not have noticed.

Due to the design of the OrangeFS server, this is rather unlikely.

It's also possible for the dentry to be deleted and recreated with the
same type.  This would be undetectable.  It's a bit of a ship of
Theseus.

Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
  • Loading branch information
Martin Brandenburg authored and Mike Marshall committed Feb 6, 2018
1 parent 480e5ae commit 74e938c
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions fs/orangefs/dcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,12 @@ static int orangefs_d_revalidate(struct dentry *dentry, unsigned int flags)
return 0;

/* We do not need to continue with negative dentries. */
if (!dentry->d_inode)
goto out;
if (!dentry->d_inode) {
gossip_debug(GOSSIP_DCACHE_DEBUG,
"%s: negative dentry or positive dentry and inode valid.\n",
__func__);
return 1;
}

/* Now we must perform a getattr to validate the inode contents. */

Expand All @@ -129,14 +133,7 @@ static int orangefs_d_revalidate(struct dentry *dentry, unsigned int flags)
__FILE__, __func__, __LINE__);
return 0;
}
if (ret == 0)
return 0;

out:
gossip_debug(GOSSIP_DCACHE_DEBUG,
"%s: negative dentry or positive dentry and inode valid.\n",
__func__);
return 1;
return !ret;
}

const struct dentry_operations orangefs_dentry_operations = {
Expand Down

0 comments on commit 74e938c

Please sign in to comment.