mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 00:48:50 +00:00
fff4c55d36
The f2fs_setxattr() prototype for CONFIG_F2FS_FS_XATTR=n has
been wrong for a long time, since 8ae8f1627f ("f2fs: support
xattr security labels"), but there have never been any callers,
so it did not matter.
Now, the function gets called from f2fs_ioc_keyctl(), which
causes a build failure:
fs/f2fs/file.c: In function 'f2fs_ioc_keyctl':
include/linux/stddef.h:7:14: error: passing argument 6 of 'f2fs_setxattr' makes integer from pointer without a cast [-Werror=int-conversion]
#define NULL ((void *)0)
^
fs/f2fs/file.c:1599:27: note: in expansion of macro 'NULL'
value, F2FS_KEY_SIZE, NULL, type);
^
In file included from ../fs/f2fs/file.c:29:0:
fs/f2fs/xattr.h:129:19: note: expected 'int' but argument is of type 'void *'
static inline int f2fs_setxattr(struct inode *inode, int index,
^
fs/f2fs/file.c:1597:9: error: too many arguments to function 'f2fs_setxattr'
return f2fs_setxattr(inode, F2FS_XATTR_INDEX_KEY,
^
In file included from ../fs/f2fs/file.c:29:0:
fs/f2fs/xattr.h:129:19: note: declared here
static inline int f2fs_setxattr(struct inode *inode, int index,
Thsi changes the prototype of the empty stub function to match
that of the actual implementation. This will not make the key
management work when F2FS_FS_XATTR is disabled, but it gets it
to build at least.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
157 lines
4.6 KiB
C
157 lines
4.6 KiB
C
/*
|
|
* fs/f2fs/xattr.h
|
|
*
|
|
* Copyright (c) 2012 Samsung Electronics Co., Ltd.
|
|
* http://www.samsung.com/
|
|
*
|
|
* Portions of this code from linux/fs/ext2/xattr.h
|
|
*
|
|
* On-disk format of extended attributes for the ext2 filesystem.
|
|
*
|
|
* (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#ifndef __F2FS_XATTR_H__
|
|
#define __F2FS_XATTR_H__
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/xattr.h>
|
|
|
|
/* Magic value in attribute blocks */
|
|
#define F2FS_XATTR_MAGIC 0xF2F52011
|
|
|
|
/* Maximum number of references to one attribute block */
|
|
#define F2FS_XATTR_REFCOUNT_MAX 1024
|
|
|
|
/* Name indexes */
|
|
#define F2FS_SYSTEM_ADVISE_NAME "system.advise"
|
|
#define F2FS_XATTR_INDEX_USER 1
|
|
#define F2FS_XATTR_INDEX_POSIX_ACL_ACCESS 2
|
|
#define F2FS_XATTR_INDEX_POSIX_ACL_DEFAULT 3
|
|
#define F2FS_XATTR_INDEX_TRUSTED 4
|
|
#define F2FS_XATTR_INDEX_LUSTRE 5
|
|
#define F2FS_XATTR_INDEX_SECURITY 6
|
|
#define F2FS_XATTR_INDEX_ADVISE 7
|
|
/* Should be same as EXT4_XATTR_INDEX_ENCRYPTION */
|
|
#define F2FS_XATTR_INDEX_ENCRYPTION 9
|
|
|
|
#define F2FS_XATTR_NAME_ENCRYPTION_CONTEXT "c"
|
|
|
|
struct f2fs_xattr_header {
|
|
__le32 h_magic; /* magic number for identification */
|
|
__le32 h_refcount; /* reference count */
|
|
__u32 h_reserved[4]; /* zero right now */
|
|
};
|
|
|
|
struct f2fs_xattr_entry {
|
|
__u8 e_name_index;
|
|
__u8 e_name_len;
|
|
__le16 e_value_size; /* size of attribute value */
|
|
char e_name[0]; /* attribute name */
|
|
};
|
|
|
|
#define XATTR_HDR(ptr) ((struct f2fs_xattr_header *)(ptr))
|
|
#define XATTR_ENTRY(ptr) ((struct f2fs_xattr_entry *)(ptr))
|
|
#define XATTR_FIRST_ENTRY(ptr) (XATTR_ENTRY(XATTR_HDR(ptr) + 1))
|
|
#define XATTR_ROUND (3)
|
|
|
|
#define XATTR_ALIGN(size) ((size + XATTR_ROUND) & ~XATTR_ROUND)
|
|
|
|
#define ENTRY_SIZE(entry) (XATTR_ALIGN(sizeof(struct f2fs_xattr_entry) + \
|
|
entry->e_name_len + le16_to_cpu(entry->e_value_size)))
|
|
|
|
#define XATTR_NEXT_ENTRY(entry) ((struct f2fs_xattr_entry *)((char *)(entry) +\
|
|
ENTRY_SIZE(entry)))
|
|
|
|
#define IS_XATTR_LAST_ENTRY(entry) (*(__u32 *)(entry) == 0)
|
|
|
|
#define list_for_each_xattr(entry, addr) \
|
|
for (entry = XATTR_FIRST_ENTRY(addr);\
|
|
!IS_XATTR_LAST_ENTRY(entry);\
|
|
entry = XATTR_NEXT_ENTRY(entry))
|
|
|
|
#define MIN_OFFSET(i) XATTR_ALIGN(inline_xattr_size(i) + PAGE_SIZE - \
|
|
sizeof(struct node_footer) - sizeof(__u32))
|
|
|
|
#define MAX_VALUE_LEN(i) (MIN_OFFSET(i) - \
|
|
sizeof(struct f2fs_xattr_header) - \
|
|
sizeof(struct f2fs_xattr_entry))
|
|
|
|
/*
|
|
* On-disk structure of f2fs_xattr
|
|
* We use inline xattrs space + 1 block for xattr.
|
|
*
|
|
* +--------------------+
|
|
* | f2fs_xattr_header |
|
|
* | |
|
|
* +--------------------+
|
|
* | f2fs_xattr_entry |
|
|
* | .e_name_index = 1 |
|
|
* | .e_name_len = 3 |
|
|
* | .e_value_size = 14 |
|
|
* | .e_name = "foo" |
|
|
* | "value_of_xattr" |<- value_offs = e_name + e_name_len
|
|
* +--------------------+
|
|
* | f2fs_xattr_entry |
|
|
* | .e_name_index = 4 |
|
|
* | .e_name = "bar" |
|
|
* +--------------------+
|
|
* | |
|
|
* | Free |
|
|
* | |
|
|
* +--------------------+<- MIN_OFFSET
|
|
* | node_footer |
|
|
* | (nid, ino, offset) |
|
|
* +--------------------+
|
|
*
|
|
**/
|
|
|
|
#ifdef CONFIG_F2FS_FS_XATTR
|
|
extern const struct xattr_handler f2fs_xattr_user_handler;
|
|
extern const struct xattr_handler f2fs_xattr_trusted_handler;
|
|
extern const struct xattr_handler f2fs_xattr_advise_handler;
|
|
extern const struct xattr_handler f2fs_xattr_security_handler;
|
|
|
|
extern const struct xattr_handler *f2fs_xattr_handlers[];
|
|
|
|
extern int f2fs_setxattr(struct inode *, int, const char *,
|
|
const void *, size_t, struct page *, int);
|
|
extern int f2fs_getxattr(struct inode *, int, const char *, void *,
|
|
size_t, struct page *);
|
|
extern ssize_t f2fs_listxattr(struct dentry *, char *, size_t);
|
|
#else
|
|
|
|
#define f2fs_xattr_handlers NULL
|
|
static inline int f2fs_setxattr(struct inode *inode, int index,
|
|
const char *name, const void *value, size_t size,
|
|
struct page *page, int flags)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
static inline int f2fs_getxattr(struct inode *inode, int index,
|
|
const char *name, void *buffer,
|
|
size_t buffer_size, struct page *dpage)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
static inline ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer,
|
|
size_t buffer_size)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_F2FS_FS_SECURITY
|
|
extern int f2fs_init_security(struct inode *, struct inode *,
|
|
const struct qstr *, struct page *);
|
|
#else
|
|
static inline int f2fs_init_security(struct inode *inode, struct inode *dir,
|
|
const struct qstr *qstr, struct page *ipage)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
#endif /* __F2FS_XATTR_H__ */
|