* [PATCH 0/4] Minor xattr handler cleanups
@ 2018-02-27 14:48 David Sterba
2018-02-27 14:48 ` [PATCH 1/4] btrfs: drop underscores from exported xattr functions David Sterba
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: David Sterba @ 2018-02-27 14:48 UTC (permalink / raw)
To: linux-btrfs; +Cc: 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 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(-)
--
2.16.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] btrfs: drop underscores from exported xattr functions
2018-02-27 14:48 [PATCH 0/4] Minor xattr handler cleanups David Sterba
@ 2018-02-27 14:48 ` David Sterba
2018-02-27 14:48 ` [PATCH 2/4] btrfs: drop extern from function declarations David Sterba
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: David Sterba @ 2018-02-27 14:48 UTC (permalink / raw)
To: linux-btrfs; +Cc: David Sterba
Signed-off-by: David Sterba <dsterba@suse.com>
---
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(-)
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 1ba49ebe67da..f8a1bdf06b2a 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -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);
diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index b30a056963ab..6aa95fad33f3 100644
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -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;
}
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index de7d072c78ef..414ccbe26c71 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -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;
diff --git a/fs/btrfs/xattr.h b/fs/btrfs/xattr.h
index 15fc4743dc70..3c227c549dfc 100644
--- a/fs/btrfs/xattr.h
+++ b/fs/btrfs/xattr.h
@@ -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);
--
2.16.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] btrfs: drop extern from function declarations
2018-02-27 14:48 [PATCH 0/4] Minor xattr handler cleanups David Sterba
2018-02-27 14:48 ` [PATCH 1/4] btrfs: drop underscores from exported xattr functions David Sterba
@ 2018-02-27 14:48 ` David Sterba
2018-02-27 14:48 ` [PATCH 3/4] btrfs: adjust return type of btrfs_getxattr David Sterba
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: David Sterba @ 2018-02-27 14:48 UTC (permalink / raw)
To: linux-btrfs; +Cc: David Sterba
Extern for functions does not make any difference, there are only a few
so let's remove them before it's too late.
Signed-off-by: David Sterba <dsterba@suse.com>
---
fs/btrfs/extent_io.h | 4 ++--
fs/btrfs/xattr.h | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index a7a850abd600..226c4876ddf8 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -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;
diff --git a/fs/btrfs/xattr.h b/fs/btrfs/xattr.h
index 3c227c549dfc..96e6f3a304d3 100644
--- a/fs/btrfs/xattr.h
+++ b/fs/btrfs/xattr.h
@@ -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);
--
2.16.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] btrfs: adjust return type of btrfs_getxattr
2018-02-27 14:48 [PATCH 0/4] Minor xattr handler cleanups David Sterba
2018-02-27 14:48 ` [PATCH 1/4] btrfs: drop underscores from exported xattr functions David Sterba
2018-02-27 14:48 ` [PATCH 2/4] btrfs: drop extern from function declarations David Sterba
@ 2018-02-27 14:48 ` David Sterba
2018-02-27 14:48 ` [PATCH 4/4] btrfs: move btrfs_listxattr prototype to xattr.h David Sterba
2018-02-27 15:02 ` [PATCH 0/4] Minor xattr handler cleanups Nikolay Borisov
4 siblings, 0 replies; 6+ messages in thread
From: David Sterba @ 2018-02-27 14:48 UTC (permalink / raw)
To: linux-btrfs; +Cc: David Sterba
The xattr_handler::get prototype returns int, use it. The only ssize_t
exception is the per-inode listxattr handler.
Signed-off-by: David Sterba <dsterba@suse.com>
---
fs/btrfs/xattr.c | 2 +-
fs/btrfs/xattr.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 414ccbe26c71..e1e8177deb5e 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -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;
diff --git a/fs/btrfs/xattr.h b/fs/btrfs/xattr.h
index 96e6f3a304d3..57c638730617 100644
--- a/fs/btrfs/xattr.h
+++ b/fs/btrfs/xattr.h
@@ -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,
--
2.16.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] btrfs: move btrfs_listxattr prototype to xattr.h
2018-02-27 14:48 [PATCH 0/4] Minor xattr handler cleanups David Sterba
` (2 preceding siblings ...)
2018-02-27 14:48 ` [PATCH 3/4] btrfs: adjust return type of btrfs_getxattr David Sterba
@ 2018-02-27 14:48 ` David Sterba
2018-02-27 15:02 ` [PATCH 0/4] Minor xattr handler cleanups Nikolay Borisov
4 siblings, 0 replies; 6+ messages in thread
From: David Sterba @ 2018-02-27 14:48 UTC (permalink / raw)
To: linux-btrfs; +Cc: David Sterba
There's a proper header for xattr handlers.
Signed-off-by: David Sterba <dsterba@suse.com>
---
fs/btrfs/ctree.h | 3 ---
fs/btrfs/xattr.h | 1 +
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 1a462ab85c49..736ba2805d03 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -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);
diff --git a/fs/btrfs/xattr.h b/fs/btrfs/xattr.h
index 57c638730617..e215a3212a2a 100644
--- a/fs/btrfs/xattr.h
+++ b/fs/btrfs/xattr.h
@@ -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,
--
2.16.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/4] Minor xattr handler cleanups
2018-02-27 14:48 [PATCH 0/4] Minor xattr handler cleanups David Sterba
` (3 preceding siblings ...)
2018-02-27 14:48 ` [PATCH 4/4] btrfs: move btrfs_listxattr prototype to xattr.h David Sterba
@ 2018-02-27 15:02 ` Nikolay Borisov
4 siblings, 0 replies; 6+ messages in thread
From: Nikolay Borisov @ 2018-02-27 15:02 UTC (permalink / raw)
To: David Sterba, linux-btrfs
On 27.02.2018 16:48, David Sterba wrote:
> 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(-)
>
The whole series LGTM:
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-02-27 15:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-27 14:48 [PATCH 0/4] Minor xattr handler cleanups David Sterba
2018-02-27 14:48 ` [PATCH 1/4] btrfs: drop underscores from exported xattr functions David Sterba
2018-02-27 14:48 ` [PATCH 2/4] btrfs: drop extern from function declarations David Sterba
2018-02-27 14:48 ` [PATCH 3/4] btrfs: adjust return type of btrfs_getxattr David Sterba
2018-02-27 14:48 ` [PATCH 4/4] btrfs: move btrfs_listxattr prototype to xattr.h David Sterba
2018-02-27 15:02 ` [PATCH 0/4] Minor xattr handler cleanups Nikolay Borisov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).