diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 15:22:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 15:22:57 -0800 |
| commit | 47853e7fa588bef826c9799a87b33904b32bd905 (patch) | |
| tree | bd7681d1aedf28125b86fb0218e64297f4d71ac9 /fs/nfs/dir.c | |
| parent | [PATCH] fs/ufs: debug mode compilation failure (diff) | |
| parent | SUNRPC: Make krb5 report unsupported encryption types (diff) | |
| download | linux-dev-47853e7fa588bef826c9799a87b33904b32bd905.tar.xz linux-dev-47853e7fa588bef826c9799a87b33904b32bd905.zip | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'fs/nfs/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index c0d1a214572c..e9255198f767 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1550,8 +1550,10 @@ go_ahead: } nfs_inode_return_delegation(old_inode); - if (new_inode) + if (new_inode != NULL) { + nfs_inode_return_delegation(new_inode); d_delete(new_dentry); + } nfs_begin_data_update(old_dir); nfs_begin_data_update(new_dir); |