openharmony/third_party_f2fs-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_f2fs-tools synced 2024-11-23 01:59:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

dump.f2fs: introduce dump_xattr

Browse Source 
This patch introduces dump_xattr to create xattrs for dumped files.

Signed-off-by: Sheng Yong <shengyong1@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
[Jaegeuk Kim: detect header files]
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Sheng Yong 2017-11-02 11:56:07 +08:00 committed by Jaegeuk Kim
parent 79f2c969a5
commit 7935c4e1f0
5 changed files with 87 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -92,7 +92,8 @@ AS_IF([test "x$have_blkid" = "xyes"],
# Checks for header files.
AC_CHECK_HEADERS([linux/fs.h linux/blkzoned.h fcntl.h mntent.h stdlib.h string.h \
sys/ioctl.h sys/mount.h unistd.h linux/falloc.h byteswap.h])
sys/ioctl.h sys/mount.h unistd.h linux/falloc.h byteswap.h \
attr/xattr.h linux/xattr.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE
@ -106,6 +107,7 @@ AC_CHECK_FUNCS_ONCE([
fallocate
getmntent
memset
fsetxattr
])
AS_IF([test "$ac_cv_header_byteswap_h" = "yes"],

75
fsck/dump.c
View File

@ -11,6 +11,13 @@
#include <inttypes.h>
#include "fsck.h"
#include "xattr.h"
#ifdef HAVE_ATTR_XATTR_H
#include <attr/xattr.h>
#endif
#ifdef HAVE_LINUX_XATTR_H
#include <linux/xattr.h>
#endif
#include <locale.h>
#define BUF_SZ 80
@ -310,15 +317,75 @@ static void dump_node_blk(struct f2fs_sb_info *sbi, int ntype,
free(node_blk);
}
#ifdef HAVE_FSETXATTR
static void dump_xattr(struct f2fs_sb_info *sbi, struct f2fs_node *node_blk)
{
void *xattr;
struct f2fs_xattr_entry *ent;
char xattr_name[F2FS_NAME_LEN] = {0};
int ret;
xattr = read_all_xattrs(sbi, node_blk);
list_for_each_xattr(ent, xattr) {
char *name = strndup(ent->e_name, ent->e_name_len);
void *value = ent->e_name + ent->e_name_len;
if (!name)
continue;
switch (ent->e_name_index) {
case F2FS_XATTR_INDEX_USER:
ret = snprintf(xattr_name, F2FS_NAME_LEN, "%s%s",
XATTR_USER_PREFIX, name);
break;
case F2FS_XATTR_INDEX_SECURITY:
ret = snprintf(xattr_name, F2FS_NAME_LEN, "%s%s",
XATTR_SECURITY_PREFIX, name);
break;
case F2FS_XATTR_INDEX_TRUSTED:
ret = snprintf(xattr_name, F2FS_NAME_LEN, "%s%s",
XATTR_TRUSTED_PREFIX, name);
break;
default:
MSG(0, "Unknown xattr index 0x%x\n", ent->e_name_index);
free(name);
continue;
}
if (ret >= F2FS_NAME_LEN) {
MSG(0, "XATTR index 0x%x name too long\n", ent->e_name_index);
free(name);
continue;
}
DBG(1, "fd %d xattr_name %s\n", c.dump_fd, xattr_name);
ret = fsetxattr(c.dump_fd, xattr_name, value,
le16_to_cpu(ent->e_value_size), 0);
if (ret)
MSG(0, "XATTR index 0x%x set xattr failed error %d\n",
ent->e_name_index, errno);
free(name);
}
free(xattr);
}
#else
static void dump_xattr(struct f2fs_sb_info *UNUSED(sbi),
struct f2fs_node *UNUSED(node_blk))
{
MSG(0, "XATTR does not support\n");
}
#endif
static void dump_inode_blk(struct f2fs_sb_info *sbi, u32 nid,
struct f2fs_node *node_blk)
{
u32 i = 0;
u64 ofs = 0;
/* TODO: need to dump xattr */
if((node_blk->i.i_inline & F2FS_INLINE_DATA)){
if((node_blk->i.i_inline & F2FS_INLINE_DATA)) {
DBG(3, "ino[0x%x] has inline data!\n", nid);
/* recover from inline data */
dev_write_dump(((unsigned char *)node_blk) + INLINE_DATA_OFFSET,
@ -345,6 +412,8 @@ static void dump_inode_blk(struct f2fs_sb_info *sbi, u32 nid,
else
ASSERT(0);
}
dump_xattr(sbi, node_blk);
}
static void dump_file(struct f2fs_sb_info *sbi, struct node_info *ni,

3
fsck/fsck.h
View File

@ -244,4 +244,7 @@ int f2fs_symlink(struct f2fs_sb_info *, struct dentry *);
int inode_set_selinux(struct f2fs_sb_info *, u32, const char *);
int f2fs_find_path(struct f2fs_sb_info *, char *, nid_t *);
/* xattr.c */
void *read_all_xattrs(struct f2fs_sb_info *, struct f2fs_node *);
#endif /* _FSCK_H_ */

2
fsck/xattr.c
View File

@ -20,7 +20,7 @@
#define XATTR_CREATE 0x1
#define XATTR_REPLACE 0x2
static void *read_all_xattrs(struct f2fs_sb_info *sbi, struct f2fs_node *inode)
void *read_all_xattrs(struct f2fs_sb_info *sbi, struct f2fs_node *inode)
{
struct f2fs_xattr_header *header;
void *txattr_addr;

9
fsck/xattr.h
View File

@ -34,7 +34,14 @@ struct f2fs_xattr_entry {
#define XATTR_ROUND (3)
#define XATTR_SELINUX_SUFFIX "selinux"
#define F2FS_XATTR_INDEX_SECURITY 6
#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_ENCRYPTION 9
#define IS_XATTR_LAST_ENTRY(entry) (*(__u32 *)(entry) == 0)
#define XATTR_HDR(ptr) ((struct f2fs_xattr_header *)(ptr))