Merge pull request #105 from giuseppe/fix-get-xattr-directory

main: if the path is a dir, work on the proc path
This commit is contained in:
Daniel J Walsh 2019-08-16 07:39:58 -04:00 committed by GitHub
commit 89b814dc27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions

View File

@ -8,6 +8,7 @@ dist: xenial
addons:
apt:
packages:
- attr
- automake
- autotools-dev
- git

4
main.c
View File

@ -554,7 +554,7 @@ open_fd_or_get_path (struct ovl_data *lo, struct ovl_node *n, char *path, int *f
path[0] = '\0';
*fd = TEMP_FAILURE_RETRY (openat (node_dirfd (n), n->path, O_NONBLOCK|O_NOFOLLOW|mode));
if (*fd < 0 && errno == ELOOP)
if (*fd < 0 && (errno == ELOOP || errno == EISDIR))
{
get_node_path (lo, n, path);
return 0;
@ -2038,7 +2038,7 @@ ovl_listxattr (fuse_req_t req, fuse_ino_t ino, size_t size)
}
path[0] = '\0';
ret = open_fd_or_get_path (lo, node, path, &fd, O_WRONLY);
ret = open_fd_or_get_path (lo, node, path, &fd, O_RDONLY);
if (ret < 0)
{
fuse_reply_err (req, errno);

View File

@ -45,5 +45,11 @@ fuse-overlayfs -o fast_ino_check=1,sync=0,lowerdir=lower,upperdir=upper,workdir=
docker run --rm -ti -v $(pwd)/merged:/merged centos:6 yum --installroot /merged -y --releasever 6 install nano
mkdir merged/a-directory
setfattr -n user.foo -v bar merged/a-directory
getfattr -d merged/a-directory | grep bar
getfattr --only-values -n user.foo merged/a-directory | grep bar
getfattr --only-values -n user.foo upper/a-directory | grep bar
umount merged