Merge branch 'linus' into x86/cpu

[sfrench/cifs-2.6.git] / fs / xattr.c

diff --git a/fs/xattr.c b/fs/xattr.c
index f7062da505d4b1a6d64fc5d686a98ed8cea5e7f4..468377e665314434fd4f5aa6fe407f50a68096fc 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -63,11 +63,11 @@ xattr_permission(struct inode *inode, const char *name, int mask)
                        return -EPERM;
        }
 
-       return permission(inode, mask, NULL);
+       return inode_permission(inode, mask);
 }
 
 int
-vfs_setxattr(struct dentry *dentry, char *name, void *value,
+vfs_setxattr(struct dentry *dentry, const char *name, const void *value,
                size_t size, int flags)
 {
        struct inode *inode = dentry->d_inode;
@@ -131,7 +131,7 @@ out_noalloc:
 EXPORT_SYMBOL_GPL(xattr_getsecurity);
 
 ssize_t
-vfs_getxattr(struct dentry *dentry, char *name, void *value, size_t size)
+vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
 {
        struct inode *inode = dentry->d_inode;
        int error;
@@ -187,7 +187,7 @@ vfs_listxattr(struct dentry *d, char *list, size_t size)
 EXPORT_SYMBOL_GPL(vfs_listxattr);
 
 int
-vfs_removexattr(struct dentry *dentry, char *name)
+vfs_removexattr(struct dentry *dentry, const char *name)
 {
        struct inode *inode = dentry->d_inode;
        int error;
@@ -218,7 +218,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
  * Extended attribute SET operations
  */
 static long
-setxattr(struct dentry *d, char __user *name, void __user *value,
+setxattr(struct dentry *d, const char __user *name, const void __user *value,
         size_t size, int flags)
 {
        int error;
@@ -252,45 +252,45 @@ setxattr(struct dentry *d, char __user *name, void __user *value,
 }
 
 asmlinkage long
-sys_setxattr(char __user *path, char __user *name, void __user *value,
-            size_t size, int flags)
+sys_setxattr(const char __user *pathname, const char __user *name,
+            const void __user *value, size_t size, int flags)
 {
-       struct nameidata nd;
+       struct path path;
        int error;
 
-       error = user_path_walk(path, &nd);
+       error = user_path(pathname, &path);
        if (error)
                return error;
-       error = mnt_want_write(nd.path.mnt);
+       error = mnt_want_write(path.mnt);
        if (!error) {
-               error = setxattr(nd.path.dentry, name, value, size, flags);
-               mnt_drop_write(nd.path.mnt);
+               error = setxattr(path.dentry, name, value, size, flags);
+               mnt_drop_write(path.mnt);
        }
-       path_put(&nd.path);
+       path_put(&path);
        return error;
 }
 
 asmlinkage long
-sys_lsetxattr(char __user *path, char __user *name, void __user *value,
-             size_t size, int flags)
+sys_lsetxattr(const char __user *pathname, const char __user *name,
+             const void __user *value, size_t size, int flags)
 {
-       struct nameidata nd;
+       struct path path;
        int error;
 
-       error = user_path_walk_link(path, &nd);
+       error = user_lpath(pathname, &path);
        if (error)
                return error;
-       error = mnt_want_write(nd.path.mnt);
+       error = mnt_want_write(path.mnt);
        if (!error) {
-               error = setxattr(nd.path.dentry, name, value, size, flags);
-               mnt_drop_write(nd.path.mnt);
+               error = setxattr(path.dentry, name, value, size, flags);
+               mnt_drop_write(path.mnt);
        }
-       path_put(&nd.path);
+       path_put(&path);
        return error;
 }
 
 asmlinkage long
-sys_fsetxattr(int fd, char __user *name, void __user *value,
+sys_fsetxattr(int fd, const char __user *name, const void __user *value,
              size_t size, int flags)
 {
        struct file *f;
@@ -307,7 +307,6 @@ sys_fsetxattr(int fd, char __user *name, void __user *value,
                error = setxattr(dentry, name, value, size, flags);
                mnt_drop_write(f->f_path.mnt);
        }
-out_fput:
        fput(f);
        return error;
 }
@@ -316,7 +315,8 @@ out_fput:
  * Extended attribute GET operations
  */
 static ssize_t
-getxattr(struct dentry *d, char __user *name, void __user *value, size_t size)
+getxattr(struct dentry *d, const char __user *name, void __user *value,
+        size_t size)
 {
        ssize_t error;
        void *kvalue = NULL;
@@ -350,37 +350,37 @@ getxattr(struct dentry *d, char __user *name, void __user *value, size_t size)
 }
 
 asmlinkage ssize_t
-sys_getxattr(char __user *path, char __user *name, void __user *value,
-            size_t size)
+sys_getxattr(const char __user *pathname, const char __user *name,
+            void __user *value, size_t size)
 {
-       struct nameidata nd;
+       struct path path;
        ssize_t error;
 
-       error = user_path_walk(path, &nd);
+       error = user_path(pathname, &path);
        if (error)
                return error;
-       error = getxattr(nd.path.dentry, name, value, size);
-       path_put(&nd.path);
+       error = getxattr(path.dentry, name, value, size);
+       path_put(&path);
        return error;
 }
 
 asmlinkage ssize_t
-sys_lgetxattr(char __user *path, char __user *name, void __user *value,
+sys_lgetxattr(const char __user *pathname, const char __user *name, void __user *value,
              size_t size)
 {
-       struct nameidata nd;
+       struct path path;
        ssize_t error;
 
-       error = user_path_walk_link(path, &nd);
+       error = user_lpath(pathname, &path);
        if (error)
                return error;
-       error = getxattr(nd.path.dentry, name, value, size);
-       path_put(&nd.path);
+       error = getxattr(path.dentry, name, value, size);
+       path_put(&path);
        return error;
 }
 
 asmlinkage ssize_t
-sys_fgetxattr(int fd, char __user *name, void __user *value, size_t size)
+sys_fgetxattr(int fd, const char __user *name, void __user *value, size_t size)
 {
        struct file *f;
        ssize_t error = -EBADF;
@@ -425,30 +425,30 @@ listxattr(struct dentry *d, char __user *list, size_t size)
 }
 
 asmlinkage ssize_t
-sys_listxattr(char __user *path, char __user *list, size_t size)
+sys_listxattr(const char __user *pathname, char __user *list, size_t size)
 {
-       struct nameidata nd;
+       struct path path;
        ssize_t error;
 
-       error = user_path_walk(path, &nd);
+       error = user_path(pathname, &path);
        if (error)
                return error;
-       error = listxattr(nd.path.dentry, list, size);
-       path_put(&nd.path);
+       error = listxattr(path.dentry, list, size);
+       path_put(&path);
        return error;
 }
 
 asmlinkage ssize_t
-sys_llistxattr(char __user *path, char __user *list, size_t size)
+sys_llistxattr(const char __user *pathname, char __user *list, size_t size)
 {
-       struct nameidata nd;
+       struct path path;
        ssize_t error;
 
-       error = user_path_walk_link(path, &nd);
+       error = user_lpath(pathname, &path);
        if (error)
                return error;
-       error = listxattr(nd.path.dentry, list, size);
-       path_put(&nd.path);
+       error = listxattr(path.dentry, list, size);
+       path_put(&path);
        return error;
 }
 
@@ -471,7 +471,7 @@ sys_flistxattr(int fd, char __user *list, size_t size)
  * Extended attribute REMOVE operations
  */
 static long
-removexattr(struct dentry *d, char __user *name)
+removexattr(struct dentry *d, const char __user *name)
 {
        int error;
        char kname[XATTR_NAME_MAX + 1];
@@ -486,43 +486,43 @@ removexattr(struct dentry *d, char __user *name)
 }
 
 asmlinkage long
-sys_removexattr(char __user *path, char __user *name)
+sys_removexattr(const char __user *pathname, const char __user *name)
 {
-       struct nameidata nd;
+       struct path path;
        int error;
 
-       error = user_path_walk(path, &nd);
+       error = user_path(pathname, &path);
        if (error)
                return error;
-       error = mnt_want_write(nd.path.mnt);
+       error = mnt_want_write(path.mnt);
        if (!error) {
-               error = removexattr(nd.path.dentry, name);
-               mnt_drop_write(nd.path.mnt);
+               error = removexattr(path.dentry, name);
+               mnt_drop_write(path.mnt);
        }
-       path_put(&nd.path);
+       path_put(&path);
        return error;
 }
 
 asmlinkage long
-sys_lremovexattr(char __user *path, char __user *name)
+sys_lremovexattr(const char __user *pathname, const char __user *name)
 {
-       struct nameidata nd;
+       struct path path;
        int error;
 
-       error = user_path_walk_link(path, &nd);
+       error = user_lpath(pathname, &path);
        if (error)
                return error;
-       error = mnt_want_write(nd.path.mnt);
+       error = mnt_want_write(path.mnt);
        if (!error) {
-               error = removexattr(nd.path.dentry, name);
-               mnt_drop_write(nd.path.mnt);
+               error = removexattr(path.dentry, name);
+               mnt_drop_write(path.mnt);
        }
-       path_put(&nd.path);
+       path_put(&path);
        return error;
 }
 
 asmlinkage long
-sys_fremovexattr(int fd, char __user *name)
+sys_fremovexattr(int fd, const char __user *name)
 {
        struct file *f;
        struct dentry *dentry;