diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-27 17:11:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-27 17:11:32 -0500 |
| commit | a814290e17ae314bd614476cffc6119846eca27e (patch) | |
| tree | 9fc40e6a34cd275bedcd2344383bd5e84f6c20df /fs/nfs | |
| parent | e55d1936f207f81c4e225d6c513e0fa487e544c5 (diff) | |
| parent | ab5d97db1c6ced3e95c00d097931471707032b1f (diff) | |
Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/dir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 2c5ace4f00a7..3c7f03b669fb 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
| @@ -1615,6 +1615,7 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
| 1615 | goto out; | 1615 | goto out; |
| 1616 | 1616 | ||
| 1617 | new_dentry = dentry; | 1617 | new_dentry = dentry; |
| 1618 | rehash = NULL; | ||
| 1618 | new_inode = NULL; | 1619 | new_inode = NULL; |
| 1619 | } | 1620 | } |
| 1620 | } | 1621 | } |