diff options
| author | Jaroslav Kysela <perex@tm8103> | 2005-11-07 11:02:51 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@tm8103> | 2005-11-07 11:02:51 +0100 |
| commit | 1d4ae4a119e5ba711f12b05cdf27f794460add4b (patch) | |
| tree | 13a196ce55115d8f64acf0db86314f5abc847b40 /fs/nfs/dir.c | |
| parent | c2f2f0fa3829a8da1e029346c4f7e8da82f95d62 (diff) | |
| parent | 0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/nfs/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 8272ed3fc707..7370583b61e5 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1257,6 +1257,9 @@ dentry->d_parent->d_name.name, dentry->d_name.name); sprintf(silly, ".nfs%*.*lx", i_inosize, i_inosize, dentry->d_inode->i_ino); + /* Return delegation in anticipation of the rename */ + nfs_inode_return_delegation(dentry->d_inode); + sdentry = NULL; do { char *suffix = silly + slen - countersize; |