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

fuse-overlayfs: name the xattr origin not redirect

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2018-07-13 12:54:09 +02:00
parent 358873e18b
commit 8b54d466e1
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.c
View File

@ -61,7 +61,7 @@
#define ENTRY_TIMEOUT 1000000000.0 #define ENTRY_TIMEOUT 1000000000.0
#define XATTR_PREFIX "user.fuseoverlayfs" #define XATTR_PREFIX "user.fuseoverlayfs"
#define REDIRECT_XATTR "user.fuseoverlayfs.redirect" #define ORIGIN_XATTR "user.fuseoverlayfs.origin"
#define NODE_TO_INODE(x) ((fuse_ino_t) x) #define NODE_TO_INODE(x) ((fuse_ino_t) x)
@ -691,8 +691,8 @@ make_ovl_node (const char *path, struct ovl_layer *layer, const char *name, ino_
if (fstat (fd, &st) == 0) if (fstat (fd, &st) == 0)
ret->ino = st.st_ino; ret->ino = st.st_ino;
/* If a redirect is specified, use it for the next layer lookup. */ /* If an origin is specified, use it for the next layer lookup. */
s = fgetxattr (fd, REDIRECT_XATTR, path, sizeof (path) - 1); s = fgetxattr (fd, ORIGIN_XATTR, path, sizeof (path) - 1);
if (s > 0) if (s > 0)
path[s] = '\0'; path[s] = '\0';
@ -2418,17 +2418,17 @@ ovl_link (fuse_req_t req, fuse_ino_t ino, fuse_ino_t newparent, const char *newn
int sfd = TEMP_FAILURE_RETRY (openat (node_dirfd (node), node->path, O_RDONLY)); int sfd = TEMP_FAILURE_RETRY (openat (node_dirfd (node), node->path, O_RDONLY));
if (sfd >= 0) if (sfd >= 0)
{ {
char redirect_path[PATH_MAX + 10]; char origin_path[PATH_MAX + 10];
ssize_t s = fgetxattr (sfd, REDIRECT_XATTR, redirect_path, sizeof (redirect_path)); ssize_t s = fgetxattr (sfd, ORIGIN_XATTR, origin_path, sizeof (origin_path));
if (s > 0) if (s > 0)
{ {
set = fsetxattr (dfd, REDIRECT_XATTR, redirect_path, s, 0) == 0; set = fsetxattr (dfd, ORIGIN_XATTR, origin_path, s, 0) == 0;
} }
close (sfd); close (sfd);
} }
if (! set) if (! set)
fsetxattr (dfd, REDIRECT_XATTR, node->path, strlen (node->path), 0); fsetxattr (dfd, ORIGIN_XATTR, node->path, strlen (node->path), 0);
close (dfd); close (dfd);
} }
} }