ncpfs: fix rmdir returns Device or resource busy
1d2ef59014
caused a regression in ncpfs such that directories could no longer be removed. This was because ncp_rmdir checked to see if a dentry could be unhashed before allowing it to be removed. Since1d2ef59014
introduced a change that incremented dentry->d_count causing it to always be greater than 1 unhash would always fail. Thus causing the error path in ncp_rmdir to always be taken. Removing this error path is safe as unhashing is still accomplished by calls to dput from vfs_rmdir. Signed-off-by: Dave Chiluk <chiluk@canonical.com> Signed-off-by: Petr Vandrovec <petr@vandrovec.name> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
4d3797d7e1
commit
698b822363
|
@ -1029,15 +1029,6 @@ static int ncp_rmdir(struct inode *dir, struct dentry *dentry)
|
||||||
DPRINTK("ncp_rmdir: removing %s/%s\n",
|
DPRINTK("ncp_rmdir: removing %s/%s\n",
|
||||||
dentry->d_parent->d_name.name, dentry->d_name.name);
|
dentry->d_parent->d_name.name, dentry->d_name.name);
|
||||||
|
|
||||||
/*
|
|
||||||
* fail with EBUSY if there are still references to this
|
|
||||||
* directory.
|
|
||||||
*/
|
|
||||||
dentry_unhash(dentry);
|
|
||||||
error = -EBUSY;
|
|
||||||
if (!d_unhashed(dentry))
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
len = sizeof(__name);
|
len = sizeof(__name);
|
||||||
error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
|
error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
|
||||||
dentry->d_name.len, !ncp_preserve_case(dir));
|
dentry->d_name.len, !ncp_preserve_case(dir));
|
||||||
|
|
Loading…
Reference in New Issue