diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
| commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
| tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /fs/nfs/dir.c | |
| parent | d2f2fcd2541bae004db7f4798ffd9d2cb75ae817 (diff) | |
| parent | 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'fs/nfs/dir.c')
| -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 | } |