Signed-off-by: Jeff Layton <jlay...@redhat.com>
---
fs/namei.c | 82 +++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 46 insertions(+), 36 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index defb210..09427f2 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3152,52 +3152,62 @@ out:
static long do_rmdir(int dfd, const char __user *pathname)
{
int error = 0;
- char * name;
+ char *name;
struct dentry *dentry;
struct nameidata nd;
+ unsigned int try = 0;
+ unsigned int lookup_flags = LOOKUP_PARENT;
- error = user_path_parent(dfd, pathname, &nd, &name);
- if (error)
- return error;
+ name = getname(pathname);
+ if (IS_ERR(name))
+ return PTR_ERR(name);
- switch(nd.last_type) {
- case LAST_DOTDOT:
- error = -ENOTEMPTY;
- goto exit1;
- case LAST_DOT:
- error = -EINVAL;
- goto exit1;
- case LAST_ROOT:
- error = -EBUSY;
- goto exit1;
- }
+ do {
+ error = do_path_lookup(dfd, name, lookup_flags, &nd);
+ if (error)
+ break;
- nd.flags &= ~LOOKUP_PARENT;
+ switch (nd.last_type) {
+ case LAST_DOTDOT:
+ error = -ENOTEMPTY;
+ goto exit1;
+ case LAST_DOT:
+ error = -EINVAL;
+ goto exit1;
+ case LAST_ROOT:
+ error = -EBUSY;
+ goto exit1;
+ }
- mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
- dentry = lookup_hash(&nd);
- error = PTR_ERR(dentry);
- if (IS_ERR(dentry))
- goto exit2;
- if (!dentry->d_inode) {
- error = -ENOENT;
- goto exit3;
- }
- error = mnt_want_write(nd.path.mnt);
- if (error)
- goto exit3;
- error = security_path_rmdir(&nd.path, dentry);
- if (error)
- goto exit4;
- error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
+ nd.flags &= ~LOOKUP_PARENT;
+
+ mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex,
+ I_MUTEX_PARENT);
+ dentry = lookup_hash(&nd);
+ error = PTR_ERR(dentry);
+ if (IS_ERR(dentry))
+ goto exit2;
+ if (!dentry->d_inode) {
+ error = -ENOENT;
+ goto exit3;
+ }
+ error = mnt_want_write(nd.path.mnt);
+ if (error)
+ goto exit3;
+ error = security_path_rmdir(&nd.path, dentry);
+ if (error)
+ goto exit4;
+ error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
exit4:
- mnt_drop_write(nd.path.mnt);
+ mnt_drop_write(nd.path.mnt);
exit3:
- dput(dentry);
+ dput(dentry);
exit2:
- mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
+ mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
exit1:
- path_put(&nd.path);
+ path_put(&nd.path);
+ lookup_flags |= LOOKUP_REVAL;
+ } while (retry_estale(error, try++));
putname(name);
return error;
}
--
1.7.11.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
