| Message ID | 20131201120653.694912626@bombadil.infradead.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Sun 01-12-13 03:59:04, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks good. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/reiserfs/xattr_acl.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c > index 06c04f7..6f721ea 100644 > --- a/fs/reiserfs/xattr_acl.c > +++ b/fs/reiserfs/xattr_acl.c > @@ -16,7 +16,7 @@ static int reiserfs_set_acl(struct reiserfs_transaction_handle *th, > struct posix_acl *acl); > > 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) > { > struct inode *inode = dentry->d_inode; > @@ -65,7 +65,7 @@ posix_acl_set(struct dentry *dentry, const char *name, const void *value, > } > > 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) > { > 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. > */ > -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; > 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. > */ > -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; > char *e; > @@ -257,7 +257,7 @@ struct posix_acl *reiserfs_get_acl(struct inode *inode, int type) > } else if (retval < 0) { > acl = ERR_PTR(retval); > } else { > - acl = posix_acl_from_disk(value, retval); > + acl = reiserfs_posix_acl_from_disk(value, retval); > } > if (!IS_ERR(acl)) > set_cached_acl(inode, type, acl); > @@ -307,7 +307,7 @@ reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode, > } > > if (acl) { > - value = posix_acl_to_disk(acl, &size); > + value = reiserfs_posix_acl_to_disk(acl, &size); > if (IS_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 = { > .prefix = POSIX_ACL_XATTR_ACCESS, > .flags = ACL_TYPE_ACCESS, > - .get = posix_acl_get, > - .set = posix_acl_set, > + .get = reiserfs_posix_acl_get, > + .set = reiserfs_posix_acl_set, > .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 = { > .prefix = POSIX_ACL_XATTR_DEFAULT, > .flags = ACL_TYPE_DEFAULT, > - .get = posix_acl_get, > - .set = posix_acl_set, > + .get = reiserfs_posix_acl_get, > + .set = reiserfs_posix_acl_set, > .list = posix_acl_default_list, > }; > -- > 1.7.10.4 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index 06c04f7..6f721ea 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c @@ -16,7 +16,7 @@ static int reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct posix_acl *acl); 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) { struct inode *inode = dentry->d_inode; @@ -65,7 +65,7 @@ posix_acl_set(struct dentry *dentry, const char *name, const void *value, } 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) { 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. */ -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; 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. */ -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; char *e; @@ -257,7 +257,7 @@ struct posix_acl *reiserfs_get_acl(struct inode *inode, int type) } else if (retval < 0) { acl = ERR_PTR(retval); } else { - acl = posix_acl_from_disk(value, retval); + acl = reiserfs_posix_acl_from_disk(value, retval); } if (!IS_ERR(acl)) set_cached_acl(inode, type, acl); @@ -307,7 +307,7 @@ reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode, } if (acl) { - value = posix_acl_to_disk(acl, &size); + value = reiserfs_posix_acl_to_disk(acl, &size); if (IS_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 = { .prefix = POSIX_ACL_XATTR_ACCESS, .flags = ACL_TYPE_ACCESS, - .get = posix_acl_get, - .set = posix_acl_set, + .get = reiserfs_posix_acl_get, + .set = reiserfs_posix_acl_set, .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 = { .prefix = POSIX_ACL_XATTR_DEFAULT, .flags = ACL_TYPE_DEFAULT, - .get = posix_acl_get, - .set = posix_acl_set, + .get = reiserfs_posix_acl_get, + .set = reiserfs_posix_acl_set, .list = posix_acl_default_list, };
Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/reiserfs/xattr_acl.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)