iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SUNRPC: rpc_unlink() must check for unhashed dentries

Browse Source 
A prior call to rpc_depopulate() by rpc_rmdir() on the parent directory may
have already called simple_unlink() on this entry.
Add the same check to rpc_rmdir(). Also remove a redundant call to
rpc_close_pipes() in rpc_rmdir.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
(cherry picked from 0bbfb9d20f6437c4031aa3bf9b4d311a053e58e3 commit)
This commit is contained in:
Trond Myklebust 2006-08-10 17:51:46 -04:00
parent dff02cc1a3
commit 68adb0af51
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/sunrpc/rpc_pipe.c
View File

@ -539,6 +539,7 @@ repeat:
rpc_close_pipes(dentry->d_inode); rpc_close_pipes(dentry->d_inode);
simple_unlink(dir, dentry); simple_unlink(dir, dentry);
} }
inode_dir_notify(dir, DN_DELETE);
dput(dentry); dput(dentry);
} while (n); } while (n);
goto repeat; goto repeat;
@ -610,8 +611,8 @@ __rpc_rmdir(struct inode *dir, struct dentry *dentry)
int error; int error;
shrink_dcache_parent(dentry); shrink_dcache_parent(dentry);
if (dentry->d_inode) if (d_unhashed(dentry))
rpc_close_pipes(dentry->d_inode); return 0;
if ((error = simple_rmdir(dir, dentry)) != 0) if ((error = simple_rmdir(dir, dentry)) != 0)
return error; return error;
if (!error) { if (!error) {
@ -747,13 +748,15 @@ rpc_unlink(struct dentry *dentry)
parent = dget_parent(dentry); parent = dget_parent(dentry);
dir = parent->d_inode; dir = parent->d_inode;
mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT); mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT);
d_drop(dentry); if (!d_unhashed(dentry)) {
if (dentry->d_inode) { d_drop(dentry);
rpc_close_pipes(dentry->d_inode); if (dentry->d_inode) {
error = simple_unlink(dir, dentry); rpc_close_pipes(dentry->d_inode);
error = simple_unlink(dir, dentry);
}
inode_dir_notify(dir, DN_DELETE);
} }
dput(dentry); dput(dentry);
inode_dir_notify(dir, DN_DELETE);
mutex_unlock(&dir->i_mutex); mutex_unlock(&dir->i_mutex);
dput(parent); dput(parent);
return error; return error;