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

Merge pull request #313 from giuseppe/fix-read-xattrs-devices

Browse Source 
fuse-overlayfs: fix read xattrs for devices
This commit is contained in:
Daniel J Walsh 2021-07-28 09:54:38 -04:00 committed by GitHub
commit c25c60ed8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
direct.c
View File

@ -43,17 +43,9 @@ direct_file_exists (struct ovl_layer *l, const char *pathname)
static int static int
direct_listxattr (struct ovl_layer *l, const char *path, char *buf, size_t size) direct_listxattr (struct ovl_layer *l, const char *path, char *buf, size_t size)
{ {
cleanup_close int fd = -1;
char full_path[PATH_MAX]; char full_path[PATH_MAX];
int ret;
full_path[0] = '\0'; strconcat3 (full_path, PATH_MAX, l->path, "/", path);
ret = open_fd_or_get_path (l, path, full_path, &fd, O_RDONLY);
if (ret < 0)
return ret;
if (fd >= 0)
return flistxattr (fd, buf, size);
return llistxattr (full_path, buf, size); return llistxattr (full_path, buf, size);
} }
@ -61,17 +53,9 @@ direct_listxattr (struct ovl_layer *l, const char *path, char *buf, size_t size)
static int static int
direct_getxattr (struct ovl_layer *l, const char *path, const char *name, char *buf, size_t size) direct_getxattr (struct ovl_layer *l, const char *path, const char *name, char *buf, size_t size)
{ {
cleanup_close int fd = -1;
char full_path[PATH_MAX]; char full_path[PATH_MAX];
int ret;
full_path[0] = '\0'; strconcat3 (full_path, PATH_MAX, l->path, "/", path);
ret = open_fd_or_get_path (l, path, full_path, &fd, O_RDONLY);
if (ret < 0)
return ret;
if (fd >= 0)
return fgetxattr (fd, name, buf, size);
return lgetxattr (full_path, name, buf, size); return lgetxattr (full_path, name, buf, size);
} }

8
tests/fedora-installs.sh
View File

@ -204,8 +204,9 @@ fi
touch merged/$(printf %${merged_max_filename_len}s | tr ' ' A}) touch merged/$(printf %${merged_max_filename_len}s | tr ' ' A})
# If a file is removed but referenced, we must still be able to access it. # If a file is removed but referenced, we must still be able to access it.
echo 12345 > merged/toremove echo 12345 | tee merged/toremove
sleep 30 < merged/toremove & cat merged/toremove
sleep 90 < merged/toremove &
sleep_pid=$! sleep_pid=$!
rm merged/toremove rm merged/toremove
grep 12345 /proc/$sleep_pid/fd/0 grep 12345 /proc/$sleep_pid/fd/0
@ -246,5 +247,8 @@ mkdir -p merged/a/b
rm -rf merged/a/b rm -rf merged/a/b
test \! -e upper/a/b test \! -e upper/a/b
mknod merged/dev-foo c 10 175
attr -l merged/dev-foo
umount merged umount merged