emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chattr: if IOC_FSGETXATTR fails, do not try IOC_FSSETXATTR

Browse Source 
function                                             old     new   delta
change_attributes                                    416     410      -6

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-06-23 19:44:15 +02:00
parent 5c89e5a04e
commit 0e55af6c61
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
e2fsprogs/chattr.c
View File

@ -141,6 +141,8 @@ static void change_attributes(const char *name, struct globals *gp);
static int FAST_FUNC chattr_dir_proc(const char *dir_name, struct dirent *de, void *gp) static int FAST_FUNC chattr_dir_proc(const char *dir_name, struct dirent *de, void *gp)
{ {
//TODO: use de->d_type (if it's not DT_UNKNOWN) to skip !(REG || DIR || LNK) entries without lstat?
char *path = concat_subpath_file(dir_name, de->d_name); char *path = concat_subpath_file(dir_name, de->d_name);
/* path is NULL if de->d_name is "." or "..", else... */ /* path is NULL if de->d_name is "." or "..", else... */
if (path) { if (path) {
@ -184,12 +186,14 @@ static void change_attributes(const char *name, struct globals *gp)
struct ext2_fsxattr fsxattr; struct ext2_fsxattr fsxattr;
r = ioctl(fd, EXT2_IOC_FSGETXATTR, &fsxattr); r = ioctl(fd, EXT2_IOC_FSGETXATTR, &fsxattr);
/* note: ^^^ may fail in 32-bit userspace on 64-bit kernel (seen on 4.12.0) */ /* note: ^^^ may fail in 32-bit userspace on 64-bit kernel (seen on 4.12.0) */
if (r != 0) if (r != 0) {
bb_perror_msg("getting %s on %s", "project ID", name); bb_perror_msg("getting %s on %s", "project ID", name);
fsxattr.fsx_projid = gp->projid; } else {
r = ioctl(fd, EXT2_IOC_FSSETXATTR, &fsxattr); fsxattr.fsx_projid = gp->projid;
if (r != 0) r = ioctl(fd, EXT2_IOC_FSSETXATTR, &fsxattr);
bb_perror_msg("setting %s on %s", "project ID", name); if (r != 0)
bb_perror_msg("setting %s on %s", "project ID", name);
}
} }
if (gp->flags & OPT_SET) { if (gp->flags & OPT_SET) {