diff --git a/[refs] b/[refs] index 40caf2b0a038..8932c6a09ae6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c8530993e1fdf1d6af0403e796fe14d80b4b097 +refs/heads/master: 56335936de1a41c8978fde62b2158af77ddc7258 diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c index 2c5ace4f00a7..3c7f03b669fb 100644 --- a/trunk/fs/nfs/dir.c +++ b/trunk/fs/nfs/dir.c @@ -1615,6 +1615,7 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, goto out; new_dentry = dentry; + rehash = NULL; new_inode = NULL; } }