Commit 698b8223 authored May 28, 2013 by Dave Chiluk Committed by Al Viro Jun 07, 2013

ncpfs: fix rmdir returns Device or resource busy



1d2ef590 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. Since
1d2ef590 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>

parent 4d3797d7

fs/ncpfs/dir.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -1029,15 +1029,6 @@ static int ncp_rmdir(struct inode dir, struct dentry dentry)
		DPRINTK("ncp_rmdir: removing %s/%s\n",
		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);
		error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
		dentry->d_name.len, !ncp_preserve_case(dir));

Admin message