Minor xattr handler cleanups
David Sterba
maintainercover Minor xattr handler cleanups
Renames, declearation updates.
David Sterba (4):
btrfs: drop underscores from exported xattr functions
btrfs: drop extern from function declarations
btrfs: adjust return type of btrfs_getxattr
btrfs: move btrfs_listxattr prototype to xattr.h
fs/btrfs/acl.c | 6 +++--- fs/btrfs/ctree.h | 3 --- fs/btrfs/extent_io.h | 4 ++-- fs/btrfs/props.c | 6 +++--- fs/btrfs/xattr.c | 12 ++++++------ fs/btrfs/xattr.h | 7 ++++--- 6 files changed, 18 insertions(+), 20 deletions(-)
Signature · 1 line
2.16.2
David Sterba
maintainerPATCH 1/4 btrfs: drop underscores from exported xattr functions
--- fs/btrfs/acl.c | 6 +++--- fs/btrfs/props.c | 6 +++--- fs/btrfs/xattr.c | 12 ++++++------ fs/btrfs/xattr.h | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-)
fs/btrfs/acl.c +3 -3
@@ -46,12 +46,12 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type)BUG (); } - size =__btrfs_getxattr (inode, name,"" ,0 ); + size =btrfs_getxattr (inode, name,"" ,0 );if (size >0 ) { value =kzalloc (size,GFP_KERNEL );if (!value)return ERR_PTR (-ENOMEM ); - size =__btrfs_getxattr (inode, name, value, size); + size =btrfs_getxattr (inode, name, value, size); }if (size >0 ) { acl =posix_acl_from_xattr (&init_user_ns, value, size);
@@ -101,7 +101,7 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans, goto out; } - ret =__btrfs_setxattr (trans, inode, name, value, size,0 ); + ret =btrfs_setxattr (trans, inode, name, value, size,0 ); out:kfree (value);
fs/btrfs/props.c +3 -3
@@ -116,7 +116,7 @@ static int __btrfs_set_prop(struct btrfs_trans_handle *trans,return -EINVAL ;if (value_len ==0 ) { - ret =__btrfs_setxattr (trans, inode, handler->xattr_name, + ret =btrfs_setxattr (trans, inode, handler->xattr_name,NULL ,0 , flags);if (ret)return ret;
@@ -130,13 +130,13 @@ static int __btrfs_set_prop(struct btrfs_trans_handle *trans, ret = handler->validate (value, value_len);if (ret)return ret; - ret =__btrfs_setxattr (trans, inode, handler->xattr_name, + ret =btrfs_setxattr (trans, inode, handler->xattr_name, value, value_len, flags);if (ret)return ret; ret = handler->apply (inode, value, value_len);if (ret) { -__btrfs_setxattr (trans, inode, handler->xattr_name, +btrfs_setxattr (trans, inode, handler->xattr_name,NULL ,0 , flags);return ret; }
fs/btrfs/xattr.c +6 -6
@@ -33,7 +33,7 @@#include "locking.h" -ssize_t __btrfs_getxattr (struct inode *inode,const char *name, +ssize_t btrfs_getxattr (struct inode *inode,const char *name,void *buffer,size_t size) {struct btrfs_dir_item *di;
@@ -233,7 +233,7 @@ static int do_setxattr(struct btrfs_trans_handle *trans,/* * @value: "" makes the attribute to empty, NULL removes it */ -int __btrfs_setxattr (struct btrfs_trans_handle *trans, +int btrfs_setxattr (struct btrfs_trans_handle *trans,struct inode *inode,const char *name,const void *value,size_t size,int flags) {
@@ -374,7 +374,7 @@ static int btrfs_xattr_handler_get(const struct xattr_handler *handler, const char *name, void *buffer, size_t size) { name =xattr_full_name (handler, name); -return __btrfs_getxattr (inode, name, buffer, size); +return btrfs_getxattr (inode, name, buffer, size); } static int btrfs_xattr_handler_set(const struct xattr_handler *handler,
@@ -383,7 +383,7 @@ static int btrfs_xattr_handler_set(const struct xattr_handler *handler, size_t size, int flags) { name =xattr_full_name (handler, name); -return __btrfs_setxattr (NULL , inode, name, buffer, size, flags); +return btrfs_setxattr (NULL , inode, name, buffer, size, flags); } static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,
@@ -448,8 +448,8 @@ static int btrfs_initxattrs(struct inode *inode, }strcpy (name,XATTR_SECURITY_PREFIX );strcpy (name +XATTR_SECURITY_PREFIX_LEN , xattr->name); - err =__btrfs_setxattr (trans, inode, name, - xattr->value, xattr->value_len,0 ); + err =btrfs_setxattr (trans, inode, name, xattr->value, + xattr->value_len,0 );kfree (name);if (err <0 )break ;
fs/btrfs/xattr.h +2 -2
@@ -23,9 +23,9 @@extern const struct xattr_handler *btrfs_xattr_handlers[]; -extern ssize_t __btrfs_getxattr (struct inode *inode,const char *name, +extern ssize_t btrfs_getxattr (struct inode *inode,const char *name,void *buffer,size_t size); -extern int __btrfs_setxattr (struct btrfs_trans_handle *trans, +extern int btrfs_setxattr (struct btrfs_trans_handle *trans,struct inode *inode,const char *name,const void *value,size_t size,int flags);
Signature · 1 line
2.16.2
David Sterba
maintainerPATCH 2/4 btrfs: drop extern from function declarations
In reply to David SterbaExtern for functions does not make any difference, there are only a few so let's remove them before it's too late.
--- fs/btrfs/extent_io.h | 4 ++-- fs/btrfs/xattr.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
fs/btrfs/extent_io.h +2 -2
@@ -83,8 +83,8 @@ static inline int le_test_bit(int nr, const u8 *addr)return 1U & (addr[BIT_BYTE (nr)] >> (nr & (BITS_PER_BYTE -1 ))); } -extern void le_bitmap_set (u8 *map,unsigned int start,int len); -extern void le_bitmap_clear (u8 *map,unsigned int start,int len); +void le_bitmap_set (u8 *map,unsigned int start,int len); +void le_bitmap_clear (u8 *map,unsigned int start,int len);struct extent_state ;struct btrfs_root ;
fs/btrfs/xattr.h +3 -3
@@ -23,13 +23,13 @@extern const struct xattr_handler *btrfs_xattr_handlers[]; -extern ssize_t btrfs_getxattr (struct inode *inode,const char *name, +ssize_t btrfs_getxattr (struct inode *inode,const char *name,void *buffer,size_t size); -extern int btrfs_setxattr (struct btrfs_trans_handle *trans, +int btrfs_setxattr (struct btrfs_trans_handle *trans,struct inode *inode,const char *name,const void *value,size_t size,int flags); -extern int btrfs_xattr_security_init (struct btrfs_trans_handle *trans, +int btrfs_xattr_security_init (struct btrfs_trans_handle *trans,struct inode *inode,struct inode *dir,const struct qstr *qstr);
Signature · 1 line
2.16.2
David Sterba
maintainerPATCH 3/4 btrfs: adjust return type of btrfs_getxattr
In reply to David SterbaThe xattr_handler::get prototype returns int, use it. The only ssize_t exception is the per-inode listxattr handler.
--- fs/btrfs/xattr.c | 2 +- fs/btrfs/xattr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/xattr.c +1 -1
@@ -33,7 +33,7 @@#include "locking.h" -ssize_t btrfs_getxattr (struct inode *inode,const char *name, +int btrfs_getxattr (struct inode *inode,const char *name,void *buffer,size_t size) {struct btrfs_dir_item *di;
fs/btrfs/xattr.h +1 -1
@@ -23,7 +23,7 @@extern const struct xattr_handler *btrfs_xattr_handlers[]; -ssize_t btrfs_getxattr (struct inode *inode,const char *name, +int btrfs_getxattr (struct inode *inode,const char *name,void *buffer,size_t size); int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode, const char *name,
Signature · 1 line
2.16.2
David Sterba
maintainerPATCH 4/4 btrfs: move btrfs_listxattr prototype to xattr.h
In reply to David SterbaThere's a proper header for xattr handlers.
--- fs/btrfs/ctree.h | 3 --- fs/btrfs/xattr.h | 1 + 2 files changed, 1 insertion(+), 3 deletions(-)
fs/btrfs/ctree.h +0 -3
@@ -3282,9 +3282,6 @@ void btrfs_exit_sysfs(void);int btrfs_sysfs_add_mounted (struct btrfs_fs_info *fs_info);void btrfs_sysfs_remove_mounted (struct btrfs_fs_info *fs_info); -/* xattr.c */ -ssize_t btrfs_listxattr (struct dentry *dentry,char *buffer,size_t size); -/* super.c */ int btrfs_parse_options (struct btrfs_fs_info *info,char *options,unsigned long new_flags);
fs/btrfs/xattr.h +1 -0
@@ -28,6 +28,7 @@ int btrfs_getxattr(struct inode *inode, const char *name,int btrfs_setxattr (struct btrfs_trans_handle *trans,struct inode *inode,const char *name,const void *value,size_t size,int flags); +ssize_t btrfs_listxattr (struct dentry *dentry,char *buffer,size_t size); int btrfs_xattr_security_init(struct btrfs_trans_handle *trans, struct inode *inode, struct inode *dir,
Signature · 1 line
2.16.2
Quoted 8 lines · David Sterba
Renames, declearation updates.
David Sterba (4):
btrfs: drop underscores from exported xattr functions
btrfs: drop extern from function declarations
btrfs: adjust return type ofbtrfs_getxattr
btrfs: movebtrfs_listxattrprototype toxattr.h
Quoted 8 lines
fs/btrfs/acl.c | 6 +++--- fs/btrfs/ctree.h | 3 --- fs/btrfs/extent_io.h | 4 ++-- fs/btrfs/props.c | 6 +++--- fs/btrfs/xattr.c | 12 ++++++------ fs/btrfs/xattr.h | 7 ++++--- 6 files changed, 18 insertions(+), 20 deletions(-)
The whole series LGTM: