git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' into next
[pandora-kernel.git]
/
fs
/
xattr.c
diff --git
a/fs/xattr.c
b/fs/xattr.c
index
89a942f
..
4706a8b
100644
(file)
--- a/
fs/xattr.c
+++ b/
fs/xattr.c
@@
-67,7
+67,7
@@
xattr_permission(struct inode *inode, const char *name, int mask)
}
int
}
int
-vfs_setxattr(struct dentry *dentry, c
har *name,
void *value,
+vfs_setxattr(struct dentry *dentry, c
onst char *name, const
void *value,
size_t size, int flags)
{
struct inode *inode = dentry->d_inode;
size_t size, int flags)
{
struct inode *inode = dentry->d_inode;
@@
-131,7
+131,7
@@
out_noalloc:
EXPORT_SYMBOL_GPL(xattr_getsecurity);
ssize_t
EXPORT_SYMBOL_GPL(xattr_getsecurity);
ssize_t
-vfs_getxattr(struct dentry *dentry, char *name, void *value, size_t size)
+vfs_getxattr(struct dentry *dentry, c
onst c
har *name, void *value, size_t size)
{
struct inode *inode = dentry->d_inode;
int error;
{
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
EXPORT_SYMBOL_GPL(vfs_listxattr);
int
-vfs_removexattr(struct dentry *dentry, char *name)
+vfs_removexattr(struct dentry *dentry, c
onst c
har *name)
{
struct inode *inode = dentry->d_inode;
int error;
{
struct inode *inode = dentry->d_inode;
int error;
@@
-218,7
+218,7
@@
EXPORT_SYMBOL_GPL(vfs_removexattr);
* Extended attribute SET operations
*/
static long
* Extended attribute SET operations
*/
static long
-setxattr(struct dentry *d, c
har __user *name,
void __user *value,
+setxattr(struct dentry *d, c
onst char __user *name, const
void __user *value,
size_t size, int flags)
{
int error;
size_t size, int flags)
{
int error;
@@
-252,8
+252,8
@@
setxattr(struct dentry *d, char __user *name, void __user *value,
}
asmlinkage long
}
asmlinkage long
-sys_setxattr(c
har __user *path, char __user *name, void __user *valu
e,
- size_t size, int flags)
+sys_setxattr(c
onst char __user *path, const char __user *nam
e,
+
const void __user *value,
size_t size, int flags)
{
struct nameidata nd;
int error;
{
struct nameidata nd;
int error;
@@
-271,8
+271,8
@@
sys_setxattr(char __user *path, char __user *name, void __user *value,
}
asmlinkage long
}
asmlinkage long
-sys_lsetxattr(c
har __user *path, char __user *name, void __user *valu
e,
- size_t size, int flags)
+sys_lsetxattr(c
onst char __user *path, const char __user *nam
e,
+
const void __user *value,
size_t size, int flags)
{
struct nameidata nd;
int error;
{
struct nameidata nd;
int error;
@@
-290,7
+290,7
@@
sys_lsetxattr(char __user *path, char __user *name, void __user *value,
}
asmlinkage long
}
asmlinkage long
-sys_fsetxattr(int fd, c
har __user *name,
void __user *value,
+sys_fsetxattr(int fd, c
onst char __user *name, const
void __user *value,
size_t size, int flags)
{
struct file *f;
size_t size, int flags)
{
struct file *f;
@@
-315,7
+315,8
@@
sys_fsetxattr(int fd, char __user *name, void __user *value,
* Extended attribute GET operations
*/
static ssize_t
* 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;
{
ssize_t error;
void *kvalue = NULL;
@@
-349,8
+350,8
@@
getxattr(struct dentry *d, char __user *name, void __user *value, size_t size)
}
asmlinkage ssize_t
}
asmlinkage ssize_t
-sys_getxattr(c
har __user *path, char __user *name, void __user *valu
e,
- size_t size)
+sys_getxattr(c
onst char __user *path, const char __user *nam
e,
+
void __user *value,
size_t size)
{
struct nameidata nd;
ssize_t error;
{
struct nameidata nd;
ssize_t error;
@@
-364,7
+365,7
@@
sys_getxattr(char __user *path, char __user *name, void __user *value,
}
asmlinkage ssize_t
}
asmlinkage ssize_t
-sys_lgetxattr(c
har __user *path,
char __user *name, void __user *value,
+sys_lgetxattr(c
onst char __user *path, const
char __user *name, void __user *value,
size_t size)
{
struct nameidata nd;
size_t size)
{
struct nameidata nd;
@@
-379,7
+380,7
@@
sys_lgetxattr(char __user *path, char __user *name, void __user *value,
}
asmlinkage ssize_t
}
asmlinkage ssize_t
-sys_fgetxattr(int fd, char __user *name, void __user *value, size_t size)
+sys_fgetxattr(int fd, c
onst c
har __user *name, void __user *value, size_t size)
{
struct file *f;
ssize_t error = -EBADF;
{
struct file *f;
ssize_t error = -EBADF;
@@
-424,7
+425,7
@@
listxattr(struct dentry *d, char __user *list, size_t size)
}
asmlinkage ssize_t
}
asmlinkage ssize_t
-sys_listxattr(char __user *path, char __user *list, size_t size)
+sys_listxattr(c
onst c
har __user *path, char __user *list, size_t size)
{
struct nameidata nd;
ssize_t error;
{
struct nameidata nd;
ssize_t error;
@@
-438,7
+439,7
@@
sys_listxattr(char __user *path, char __user *list, size_t size)
}
asmlinkage ssize_t
}
asmlinkage ssize_t
-sys_llistxattr(char __user *path, char __user *list, size_t size)
+sys_llistxattr(c
onst c
har __user *path, char __user *list, size_t size)
{
struct nameidata nd;
ssize_t error;
{
struct nameidata nd;
ssize_t error;
@@
-470,7
+471,7
@@
sys_flistxattr(int fd, char __user *list, size_t size)
* Extended attribute REMOVE operations
*/
static long
* Extended attribute REMOVE operations
*/
static long
-removexattr(struct dentry *d, char __user *name)
+removexattr(struct dentry *d, c
onst c
har __user *name)
{
int error;
char kname[XATTR_NAME_MAX + 1];
{
int error;
char kname[XATTR_NAME_MAX + 1];
@@
-485,7
+486,7
@@
removexattr(struct dentry *d, char __user *name)
}
asmlinkage long
}
asmlinkage long
-sys_removexattr(c
har __user *path,
char __user *name)
+sys_removexattr(c
onst char __user *path, const
char __user *name)
{
struct nameidata nd;
int error;
{
struct nameidata nd;
int error;
@@
-503,7
+504,7
@@
sys_removexattr(char __user *path, char __user *name)
}
asmlinkage long
}
asmlinkage long
-sys_lremovexattr(c
har __user *path,
char __user *name)
+sys_lremovexattr(c
onst char __user *path, const
char __user *name)
{
struct nameidata nd;
int error;
{
struct nameidata nd;
int error;
@@
-521,7
+522,7
@@
sys_lremovexattr(char __user *path, char __user *name)
}
asmlinkage long
}
asmlinkage long
-sys_fremovexattr(int fd, char __user *name)
+sys_fremovexattr(int fd, c
onst c
har __user *name)
{
struct file *f;
struct dentry *dentry;
{
struct file *f;
struct dentry *dentry;