marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: Eliminate remaining uses of strerror(errno) 

%m allows a smaller filesize. Useful on embedded systems.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Rosen Penev 2018-09-12 17:52:16 -07:00 committed by David Sterba
parent 9d3303fa1b
commit 251d32ea5c
4 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmds-qgroup.c
View File

@ -380,8 +380,7 @@ static int cmd_qgroup_show(int argc, char **argv)
if (sync) { if (sync) {
err = btrfs_util_sync_fd(fd); err = btrfs_util_sync_fd(fd);
if (err) if (err)
warning("sync ioctl failed on '%s': %s", path, warning("sync ioctl failed on '%s': %m", path);
strerror(errno));
} }
if (filter_flag) { if (filter_flag) {

4
messages.h
View File

@ -61,9 +61,9 @@
PRINT_TRACE_ON_ERROR; \ PRINT_TRACE_ON_ERROR; \
PRINT_VERBOSE_ERROR; \ PRINT_VERBOSE_ERROR; \
if (lib_str && strcmp(errno_str, lib_str) != 0) \ if (lib_str && strcmp(errno_str, lib_str) != 0) \
__btrfs_error("%s: %s", lib_str, errno_str); \ __btrfs_error("%s: %m", lib_str); \
else \ else \
__btrfs_error("%s", errno_str); \ __btrfs_error("%m"); \
DO_ABORT_ON_ERROR; \ DO_ABORT_ON_ERROR; \
} while (0) } while (0)

47
mkfs/rootdir.c
View File

@ -237,8 +237,7 @@ static int add_xattr_item(struct btrfs_trans_handle *trans,
if (ret < 0) { if (ret < 0) {
if (errno == ENOTSUP) if (errno == ENOTSUP)
return 0; return 0;
error("getting a list of xattr failed for %s: %s", file_name, error("getting a list of xattr failed for %s: %m", file_name);
strerror(errno));
return ret; return ret;
} }
if (ret == 0) if (ret == 0)
@ -253,8 +252,8 @@ static int add_xattr_item(struct btrfs_trans_handle *trans,
if (ret < 0) { if (ret < 0) {
if (errno == ENOTSUP) if (errno == ENOTSUP)
return 0; return 0;
error("getting a xattr value failed for %s attr %s: %s", error("getting a xattr value failed for %s attr %s: %m",
file_name, cur_name, strerror(errno)); file_name, cur_name);
return ret; return ret;
} }
@ -281,7 +280,7 @@ static int add_symbolic_link(struct btrfs_trans_handle *trans,
ret = readlink(path_name, buf, sizeof(buf)); ret = readlink(path_name, buf, sizeof(buf));
if (ret <= 0) { if (ret <= 0) {
error("readlink failed for %s: %s", path_name, strerror(errno)); error("readlink failed for %s: %m", path_name);
goto fail; goto fail;
} }
if (ret >= sizeof(buf)) { if (ret >= sizeof(buf)) {
@ -320,7 +319,7 @@ static int add_file_items(struct btrfs_trans_handle *trans,
fd = open(path_name, O_RDONLY); fd = open(path_name, O_RDONLY);
if (fd == -1) { if (fd == -1) {
error("cannot open %s: %s", path_name, strerror(errno)); error("cannot open %s: %m", path_name);
return ret; return ret;
} }
@ -339,10 +338,9 @@ static int add_file_items(struct btrfs_trans_handle *trans,
ret_read = pread64(fd, buffer, st->st_size, bytes_read); ret_read = pread64(fd, buffer, st->st_size, bytes_read);
if (ret_read == -1) { if (ret_read == -1) {
error("cannot read %s at offset %llu length %llu: %s", error("cannot read %s at offset %llu length %llu: %m",
path_name, (unsigned long long)bytes_read, path_name, (unsigned long long)bytes_read,
(unsigned long long)st->st_size, (unsigned long long)st->st_size);
strerror(errno));
free(buffer); free(buffer);
goto end; goto end;
} }
@ -388,11 +386,10 @@ again:
ret_read = pread64(fd, eb->data, sectorsize, file_pos + ret_read = pread64(fd, eb->data, sectorsize, file_pos +
bytes_read); bytes_read);
if (ret_read == -1) { if (ret_read == -1) {
error("cannot read %s at offset %llu length %llu: %s", error("cannot read %s at offset %llu length %llu: %m",
path_name, path_name,
(unsigned long long)file_pos + bytes_read, (unsigned long long)file_pos + bytes_read,
(unsigned long long)sectorsize, (unsigned long long)sectorsize);
strerror(errno));
goto end; goto end;
} }
@ -467,7 +464,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
dir_entry->dir_name = dir_name; dir_entry->dir_name = dir_name;
dir_entry->path = realpath(dir_name, NULL); dir_entry->path = realpath(dir_name, NULL);
if (!dir_entry->path) { if (!dir_entry->path) {
error("realpath failed for %s: %s", dir_name, strerror(errno)); error("realpath failed for %s: %m", dir_name);
ret = -1; ret = -1;
goto fail_no_dir; goto fail_no_dir;
} }
@ -506,8 +503,8 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
parent_inum = parent_dir_entry->inum; parent_inum = parent_dir_entry->inum;
parent_dir_name = parent_dir_entry->dir_name; parent_dir_name = parent_dir_entry->dir_name;
if (chdir(parent_dir_entry->path)) { if (chdir(parent_dir_entry->path)) {
error("chdir failed for %s: %s", error("chdir failed for %s: %m",
parent_dir_name, strerror(errno)); parent_dir_name);
ret = -1; ret = -1;
goto fail_no_files; goto fail_no_files;
} }
@ -515,8 +512,8 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
count = scandir(parent_dir_entry->path, &files, count = scandir(parent_dir_entry->path, &files,
directory_select, NULL); directory_select, NULL);
if (count == -1) { if (count == -1) {
error("scandir failed for %s: %s", error("scandir failed for %s: %m",
parent_dir_name, strerror(errno)); parent_dir_name);
ret = -1; ret = -1;
goto fail; goto fail;
} }
@ -525,8 +522,8 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
cur_file = files[i]; cur_file = files[i];
if (lstat(cur_file->d_name, &st) == -1) { if (lstat(cur_file->d_name, &st) == -1) {
error("lstat failed for %s: %s", error("lstat failed for %s: %m",
cur_file->d_name, strerror(errno)); cur_file->d_name);
ret = -1; ret = -1;
goto fail; goto fail;
} }
@ -648,7 +645,7 @@ int btrfs_mkfs_fill_dir(const char *source_dir, struct btrfs_root *root,
ret = lstat(source_dir, &root_st); ret = lstat(source_dir, &root_st);
if (ret) { if (ret) {
error("unable to lstat %s: %s", source_dir, strerror(errno)); error("unable to lstat %s: %m", source_dir);
ret = -errno; ret = -errno;
goto out; goto out;
} }
@ -739,8 +736,7 @@ u64 btrfs_mkfs_size_dir(const char *dir_name, u32 sectorsize, u64 min_dev_size,
*/ */
ret = nftw(dir_name, ftw_add_entry_size, 10, FTW_PHYS); ret = nftw(dir_name, ftw_add_entry_size, 10, FTW_PHYS);
if (ret < 0) { if (ret < 0) {
error("ftw subdir walk of %s failed: %s", dir_name, error("ftw subdir walk of %s failed: %m", dir_name);
strerror(errno));
exit(1); exit(1);
} }
@ -946,16 +942,15 @@ int btrfs_mkfs_shrink_fs(struct btrfs_fs_info *fs_info, u64 *new_size_ret,
if (shrink_file_size) { if (shrink_file_size) {
ret = fstat64(device->fd, &file_stat); ret = fstat64(device->fd, &file_stat);
if (ret < 0) { if (ret < 0) {
error("failed to stat devid %llu: %s", device->devid, error("failed to stat devid %llu: %m", device->devid);
strerror(errno));
return ret; return ret;
} }
if (!S_ISREG(file_stat.st_mode)) if (!S_ISREG(file_stat.st_mode))
return ret; return ret;
ret = ftruncate64(device->fd, new_size); ret = ftruncate64(device->fd, new_size);
if (ret < 0) { if (ret < 0) {
error("failed to truncate device file of devid %llu: %s", error("failed to truncate device file of devid %llu: %m",
device->devid, strerror(errno)); device->devid);
return ret; return ret;
} }
} }

3
qgroup.c
View File

@ -1072,8 +1072,7 @@ static int __qgroups_search(int fd, struct qgroup_lookup *qgroup_lookup)
error("can't list qgroups: quotas not enabled"); error("can't list qgroups: quotas not enabled");
ret = -ENOTTY; ret = -ENOTTY;
} else { } else {
error("can't list qgroups: %s", error("can't list qgroups: %m");
strerror(errno));
ret = -errno; ret = -errno;
} }