TheCloud/fuse-overlayfs
1
0
Fork 0
mirror of https://github.com/containers/fuse-overlayfs.git synced 2025-08-03 18:05:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

containerfs: refactor xattr copy to a new function

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2018-07-06 11:33:45 +02:00
parent 3b7a5a79af
commit c820997ed6
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
main.c
View File

@ -1186,6 +1186,29 @@ lo_access (fuse_req_t req, fuse_ino_t ino, int mask)
fuse_reply_err (req, ret < 0 ? errno : 0);
}
static int
copy_xattr (int sfd, int dfd, char *buf, size_t buf_size)
{
size_t xattr_len;
xattr_len = flistxattr (sfd, buf, buf_size / 2);
if (xattr_len > 0)
{
char *it;
char *xattr_buf = buf + buf_size / 2;
for (it = buf; it - buf < xattr_len; it += strlen (it) + 1)
{
ssize_t s = fgetxattr (sfd, it, xattr_buf, buf_size / 2);
if (s < 0)
return -1;
if (fsetxattr (dfd, it, xattr_buf, s, 0) < 0)
return -1;
}
}
return 0;
}
static int
create_directory (struct lo_data *lo, struct lo_node *src)
{
@ -1247,7 +1270,6 @@ copyup (struct lo_data *lo, struct lo_node *node)
const size_t buf_size = 1 << 20;
char *buf = NULL;
struct timespec times[2];
ssize_t xattr_len;
char wd_tmp_file_name[32];
if (node->parent)
@ -1335,24 +1357,9 @@ copyup (struct lo_data *lo, struct lo_node *node)
if (ret < 0)
goto exit;
xattr_len = flistxattr (sfd, buf, buf_size / 2);
if (xattr_len > 0)
{
char *it;
char *xattr_buf = buf + buf_size / 2;
for (it = buf; it - buf < xattr_len; it += strlen (it) + 1)
{
ssize_t s = fgetxattr (sfd, it, xattr_buf, buf_size / 2);
if (s < 0)
{
ret = -1;
goto exit;
}
ret = fsetxattr (dfd, it, xattr_buf, s, 0);
if (ret < 0)
goto exit;
}
}
ret = copy_xattr (sfd, dfd, buf, buf_size);
if (ret < 0)
goto exit;
/* Finally, move the file to its destination. */
ret = renameat (lo->workdir_fd, wd_tmp_file_name, get_upper_layer (lo)->fd, node->path);