new helpers: kern_path_create/user_path_create

[pandora-kernel.git] / fs / ocfs2 / refcounttree.c

diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index ebfd382..cf78233 100644 (file)
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -4368,25 +4368,6 @@ static inline int ocfs2_may_create(struct inode *dir, struct dentry *child)
        return inode_permission(dir, MAY_WRITE | MAY_EXEC);
 }
 
-/* copied from user_path_parent. */
-static int ocfs2_user_path_parent(const char __user *path,
-                                 struct nameidata *nd, char **name)
-{
-       char *s = getname(path);
-       int error;
-
-       if (IS_ERR(s))
-               return PTR_ERR(s);
-
-       error = kern_path_parent(s, nd);
-       if (error)
-               putname(s);
-       else
-               *name = s;
-
-       return error;
-}
-
 /**
  * ocfs2_vfs_reflink - Create a reference-counted link
  *
@@ -4460,10 +4441,8 @@ int ocfs2_reflink_ioctl(struct inode *inode,
                        bool preserve)
 {
        struct dentry *new_dentry;
-       struct nameidata nd;
-       struct path old_path;
+       struct path old_path, new_path;
        int error;
-       char *to = NULL;
 
        if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb)))
                return -EOPNOTSUPP;
@@ -4474,39 +4453,33 @@ int ocfs2_reflink_ioctl(struct inode *inode,
                return error;
        }
 
-       error = ocfs2_user_path_parent(newname, &nd, &to);
-       if (error) {
+       new_dentry = user_path_create(AT_FDCWD, newname, &new_path, 0);
+       error = PTR_ERR(new_dentry);
+       if (IS_ERR(new_dentry)) {
                mlog_errno(error);
                goto out;
        }
 
        error = -EXDEV;
-       if (old_path.mnt != nd.path.mnt)
-               goto out_release;
-       new_dentry = lookup_create(&nd, 0);
-       error = PTR_ERR(new_dentry);
-       if (IS_ERR(new_dentry)) {
+       if (old_path.mnt != new_path.mnt) {
                mlog_errno(error);
-               goto out_unlock;
+               goto out_dput;
        }
 
-       error = mnt_want_write(nd.path.mnt);
+       error = mnt_want_write(new_path.mnt);
        if (error) {
                mlog_errno(error);
                goto out_dput;
        }
 
        error = ocfs2_vfs_reflink(old_path.dentry,
-                                 nd.path.dentry->d_inode,
+                                 new_path.dentry->d_inode,
                                  new_dentry, preserve);
-       mnt_drop_write(nd.path.mnt);
+       mnt_drop_write(new_path.mnt);
 out_dput:
        dput(new_dentry);
-out_unlock:
-       mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
-out_release:
-       path_put(&nd.path);
-       putname(to);
+       mutex_unlock(&new_path.dentry->d_inode->i_mutex);
+       path_put(&new_path);
 out:
        path_put(&old_path);