Signed-off-by: Jeff Layton <jlay...@redhat.com>
---
fs/namei.c | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 6705757..4bec3f4 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3051,26 +3051,35 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *,
pathname, umode_t, mode)
struct dentry *dentry;
struct path path;
int error;
+ char *name;
+ unsigned int try = 0;
- dentry = user_path_create(dfd, pathname, &path, 1);
- if (IS_ERR(dentry))
- return PTR_ERR(dentry);
-
- if (!IS_POSIXACL(path.dentry->d_inode))
- mode &= ~current_umask();
- error = mnt_want_write(path.mnt);
- if (error)
- goto out_dput;
- error = security_path_mkdir(&path, dentry, mode);
- if (error)
- goto out_drop_write;
- error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
+ name = getname(pathname);
+ if (IS_ERR(name))
+ return PTR_ERR(name);
+ do {
+ dentry = kern_path_create(dfd, name, &path, true, try);
+ if (IS_ERR(dentry)) {
+ error = PTR_ERR(dentry);
+ break;
+ }
+ if (!IS_POSIXACL(path.dentry->d_inode))
+ mode &= ~current_umask();
+ error = mnt_want_write(path.mnt);
+ if (error)
+ goto out_dput;
+ error = security_path_mkdir(&path, dentry, mode);
+ if (error)
+ goto out_drop_write;
+ error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
out_drop_write:
- mnt_drop_write(path.mnt);
+ mnt_drop_write(path.mnt);
out_dput:
- dput(dentry);
- mutex_unlock(&path.dentry->d_inode->i_mutex);
- path_put(&path);
+ dput(dentry);
+ mutex_unlock(&path.dentry->d_inode->i_mutex);
+ path_put(&path);
+ } 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/
