| Message ID | 1370469463-19950-2-git-send-email-chiluk@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 06/05/2013 02:57 PM, Dave Chiluk wrote: > BugLink: http://bugs.launchpad.net/bugs/1035226 > > 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> > --- > fs/ncpfs/dir.c | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c > index 9c51f62..844bd64 100644 > --- a/fs/ncpfs/dir.c > +++ b/fs/ncpfs/dir.c > @@ -1033,15 +1033,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)); >
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index 9c51f62..844bd64 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c @@ -1033,15 +1033,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));
BugLink: http://bugs.launchpad.net/bugs/1035226 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> --- fs/ncpfs/dir.c | 9 --------- 1 file changed, 9 deletions(-)