korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-24 02:25:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint' into next

Browse Source
This commit is contained in:
Theodore Ts'o 2018-10-14 12:31:06 -04:00
commit 29d78e01ef
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/android/perms.c
View File

@ -25,6 +25,7 @@ struct inode_params {
time_t fixed_time;
const struct ugid_map* uid_map;
const struct ugid_map* gid_map;
errcode_t error;
};
static errcode_t ino_add_xattr(ext2_filsys fs, ext2_ino_t ino, const char *name,
@ -82,7 +83,7 @@ static errcode_t set_selinux_xattr(ext2_filsys fs, ext2_ino_t ino,
if (retval < 0) {
com_err(__func__, retval,
_("searching for label \"%s\""), params->filename);
exit(1);
return retval;
}
retval = ino_add_xattr(fs, ino, "security." XATTR_SELINUX_SUFFIX,
@ -249,8 +250,10 @@ static int walk_dir(ext2_ino_t dir EXT2FS_ATTR((unused)),
return 0;
if (asprintf(&params->filename, "%s/%.*s", params->path, name_len,
de->name) < 0)
de->name) < 0) {
params->error = ENOMEM;
return -ENOMEM;
}
if (!strncmp(de->name, "lost+found", 10)) {
retval = set_selinux_xattr(params->fs, de->inode, params);
@ -264,8 +267,10 @@ static int walk_dir(ext2_ino_t dir EXT2FS_ATTR((unused)),
char *cur_path = params->path;
char *cur_filename = params->filename;
params->path = params->filename;
ext2fs_dir_iterate2(params->fs, de->inode, 0, NULL,
walk_dir, params);
retval = ext2fs_dir_iterate2(params->fs, de->inode, 0, NULL,
walk_dir, params);
if (retval)
goto end;
params->path = cur_path;
params->filename = cur_filename;
}
@ -273,6 +278,7 @@ static int walk_dir(ext2_ino_t dir EXT2FS_ATTR((unused)),
end:
free(params->filename);
params->error |= retval;
return retval;
}
@ -298,6 +304,7 @@ errcode_t __android_configure_fs(ext2_filsys fs, char *src_dir,
.mountpoint = mountpoint,
.uid_map = uid_map,
.gid_map = gid_map,
.error = 0
};
/* walk_dir will add the "/". Don't add it twice. */
@ -308,8 +315,11 @@ errcode_t __android_configure_fs(ext2_filsys fs, char *src_dir,
if (retval)
return retval;
return ext2fs_dir_iterate2(fs, EXT2_ROOT_INO, 0, NULL, walk_dir,
&params);
retval = ext2fs_dir_iterate2(fs, EXT2_ROOT_INO, 0, NULL, walk_dir,
&params);
if (retval)
return retval;
return params.error;
}
errcode_t android_configure_fs(ext2_filsys fs, char *src_dir, char *target_out,

2
debugfs/set_fields.c
View File

@ -75,7 +75,7 @@ static errcode_t parse_gd_csum(struct field_set_info *info, char *field, char *a
static errcode_t parse_mmp_clear(struct field_set_info *info, char *field,
char *arg);
#if __GNUC_PREREQ (4, 6)
#if __GNUC_PREREQ (4, 6) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#endif

1
resize/Android.bp
View File

@ -15,7 +15,6 @@ cc_binary {
],
shared_libs: [
"libext2fs",
"libext2_com_err",
"libext2_e2p",
"libext2_uuid",
"libext2_blkid",