Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40119
b: refs/heads/master
c: fc22617
h: refs/heads/master
i:
  40117: 12f73a4
  40115: e829c5b
  40111: 51d3431
v: v3
  • Loading branch information
Trond Myklebust authored and Linus Torvalds committed Oct 21, 2006
1 parent 13f5128 commit 0452e60
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9eaef27b36a6b716384948da94b8fc5bfba7b712
refs/heads/master: fc22617e451f23b466d4d63bb016f5f6111b69e4
6 changes: 6 additions & 0 deletions trunk/fs/nfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -936,8 +936,14 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
struct dentry *parent;
if (IS_ERR(res))
goto out_unlock;
/* Was a directory renamed! */
parent = dget_parent(res);
if (!IS_ROOT(parent))
nfs_mark_for_revalidate(parent->d_inode);
dput(parent);
dentry = res;
}
nfs_renew_times(dentry);
Expand Down

0 comments on commit 0452e60

Please sign in to comment.