kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

reiserfs: prefix ACL symbols with reiserfs_

Browse source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Christoph Hellwig 2013-12-20 05:16:36 -08:00 committed by Al Viro
parent ac34a1b35e
commit 9dad943ae7
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
fs/reiserfs/xattr_acl.c
View file

@ -16,7 +16,7 @@ static int reiserfs_set_acl(struct reiserfs_transaction_handle *th,
struct posix_acl *acl); struct posix_acl *acl);
static int static int
posix_acl_set(struct dentry *dentry, const char *name, const void *value, reiserfs_posix_acl_set(struct dentry *dentry, const char *name, const void *value,
size_t size, int flags, int type) size_t size, int flags, int type)
{ {
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
@ -65,7 +65,7 @@ posix_acl_set(struct dentry *dentry, const char *name, const void *value,
} }
static int static int
posix_acl_get(struct dentry *dentry, const char *name, void *buffer, reiserfs_posix_acl_get(struct dentry *dentry, const char *name, void *buffer,
size_t size, int type) size_t size, int type)
{ {
struct posix_acl *acl; struct posix_acl *acl;
@ -88,7 +88,7 @@ posix_acl_get(struct dentry *dentry, const char *name, void *buffer,
/* /*
* Convert from filesystem to in-memory representation. * Convert from filesystem to in-memory representation.
*/ */
static struct posix_acl *posix_acl_from_disk(const void *value, size_t size) static struct posix_acl *reiserfs_posix_acl_from_disk(const void *value, size_t size)
{ {
const char *end = (char *)value + size; const char *end = (char *)value + size;
int n, count; int n, count;
@ -158,7 +158,7 @@ static struct posix_acl *posix_acl_from_disk(const void *value, size_t size)
/* /*
* Convert from in-memory to filesystem representation. * Convert from in-memory to filesystem representation.
*/ */
static void *posix_acl_to_disk(const struct posix_acl *acl, size_t * size) static void *reiserfs_posix_acl_to_disk(const struct posix_acl *acl, size_t * size)
{ {
reiserfs_acl_header *ext_acl; reiserfs_acl_header *ext_acl;
char *e; char *e;
@ -257,7 +257,7 @@ struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
} else if (retval < 0) { } else if (retval < 0) {
acl = ERR_PTR(retval); acl = ERR_PTR(retval);
} else { } else {
acl = posix_acl_from_disk(value, retval); acl = reiserfs_posix_acl_from_disk(value, retval);
} }
if (!IS_ERR(acl)) if (!IS_ERR(acl))
set_cached_acl(inode, type, acl); set_cached_acl(inode, type, acl);
@ -307,7 +307,7 @@ reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
} }
if (acl) { if (acl) {
value = posix_acl_to_disk(acl, &size); value = reiserfs_posix_acl_to_disk(acl, &size);
if (IS_ERR(value)) if (IS_ERR(value))
return (int)PTR_ERR(value); return (int)PTR_ERR(value);
} }
@ -499,8 +499,8 @@ static size_t posix_acl_access_list(struct dentry *dentry, char *list,
const struct xattr_handler reiserfs_posix_acl_access_handler = { const struct xattr_handler reiserfs_posix_acl_access_handler = {
.prefix = POSIX_ACL_XATTR_ACCESS, .prefix = POSIX_ACL_XATTR_ACCESS,
.flags = ACL_TYPE_ACCESS, .flags = ACL_TYPE_ACCESS,
.get = posix_acl_get, .get = reiserfs_posix_acl_get,
.set = posix_acl_set, .set = reiserfs_posix_acl_set,
.list = posix_acl_access_list, .list = posix_acl_access_list,
}; };
@ -519,7 +519,7 @@ static size_t posix_acl_default_list(struct dentry *dentry, char *list,
const struct xattr_handler reiserfs_posix_acl_default_handler = { const struct xattr_handler reiserfs_posix_acl_default_handler = {
.prefix = POSIX_ACL_XATTR_DEFAULT, .prefix = POSIX_ACL_XATTR_DEFAULT,
.flags = ACL_TYPE_DEFAULT, .flags = ACL_TYPE_DEFAULT,
.get = posix_acl_get, .get = reiserfs_posix_acl_get,
.set = posix_acl_set, .set = reiserfs_posix_acl_set,
.list = posix_acl_default_list, .list = posix_acl_default_list,
}; };