ncpfs: fix rmdir returns Device or resource busy
authorDave Chiluk <chiluk@canonical.com>
Tue, 28 May 2013 21:06:08 +0000 (16:06 -0500)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 29 Jun 2013 03:06:44 +0000 (04:06 +0100)
commit21544884d7d5f8890314271c158926ca0de43719
tree0a41a9e6d0b981c5be699c9c2e7f93f18c835b22
parent46a000571be614e1b69eaacfc28e79e94393f1d5
ncpfs: fix rmdir returns Device or resource busy

commit 698b8223631472bf982ed570b0812faa61955683 upstream.

1d2ef5901483004d74947bbf78d5146c24038fe7 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
1d2ef5901483004d74947bbf78d5146c24038fe7 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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/ncpfs/dir.c