f2fs: xattr simplifications

Now that the xattr handler is passed to the xattr handler operations, we
have access to the attribute name prefix, so simplify
f2fs_xattr_generic_list.

Also, f2fs_xattr_advise_list is only ever called for
f2fs_xattr_advise_handler; there is no need to double check for that.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Changman Lee <cm224.lee@samsung.com>
Cc: Chao Yu <chao2.yu@samsung.com>
Cc: linux-f2fs-devel@lists.sourceforge.net
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index e643173..862368a 100644 (file)
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -30,33 +30,27 @@ static size_t f2fs_xattr_generic_list(const struct xattr_handler *handler,
                const char *name, size_t len)
 {
        struct f2fs_sb_info *sbi = F2FS_SB(dentry->d_sb);
-       int total_len, prefix_len = 0;
-       const char *prefix = NULL;
+       int total_len, prefix_len;
 
        switch (handler->flags) {
        case F2FS_XATTR_INDEX_USER:
                if (!test_opt(sbi, XATTR_USER))
                        return -EOPNOTSUPP;
-               prefix = XATTR_USER_PREFIX;
-               prefix_len = XATTR_USER_PREFIX_LEN;
                break;
        case F2FS_XATTR_INDEX_TRUSTED:
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
-               prefix = XATTR_TRUSTED_PREFIX;
-               prefix_len = XATTR_TRUSTED_PREFIX_LEN;
                break;
        case F2FS_XATTR_INDEX_SECURITY:
-               prefix = XATTR_SECURITY_PREFIX;
-               prefix_len = XATTR_SECURITY_PREFIX_LEN;
                break;
        default:
                return -EINVAL;
        }
 
+       prefix_len = strlen(handler->prefix);
        total_len = prefix_len + len + 1;
        if (list && total_len <= list_size) {
-               memcpy(list, prefix, prefix_len);
+               memcpy(list, handler->prefix, prefix_len);
                memcpy(list + prefix_len, name, len);
                list[prefix_len + len] = '\0';
        }
@@ -123,9 +117,6 @@ static size_t f2fs_xattr_advise_list(const struct xattr_handler *handler,
        const char *xname = F2FS_SYSTEM_ADVISE_PREFIX;
        size_t size;
 
-       if (handler->flags != F2FS_XATTR_INDEX_ADVISE)
-               return 0;
-
        size = strlen(xname) + 1;
        if (list && size <= list_size)
                memcpy(list, xname, size);