Skip to content

Commit

Permalink
Merge pull request #170 from giuseppe/check-whiteout
Browse files Browse the repository at this point in the history 
main: check if file is whiteout
  • Loading branch information
@rhatdan
rhatdan authored Jan 16, 2020
2 parents dd7cf03 + ce93aba commit 6044520
Showing 1 changed file with 24 additions and 18 deletions.
42 changes: 24 additions & 18 deletions main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2260,7 +2260,7 @@ ovl_getxattr (fuse_req_t req, fuse_ino_t ino, const char *name, size_t size)
}

node = do_lookup_file (lo, ino, NULL);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -2328,7 +2328,13 @@ copy_xattr (int sfd, int dfd, char *buf, size_t buf_size)
for (it = buf; it - buf < xattr_len; it += strlen (it) + 1)
{
cleanup_free char *v = NULL;
ssize_t s = safe_read_xattr (&v, sfd, it, 256);
ssize_t s;

if (has_prefix (it, XATTR_PREFIX)
|| has_prefix (it, PRIVILEGED_XATTR_PREFIX))
continue;

s = safe_read_xattr (&v, sfd, it, 256);
if (s < 0)
return -1;

Expand Down Expand Up @@ -2849,7 +2855,7 @@ do_rm (fuse_req_t req, fuse_ino_t parent, const char *name, bool dirp)
struct ovl_node key, *rm;

node = do_lookup_file (lo, parent, name);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -2895,7 +2901,7 @@ do_rm (fuse_req_t req, fuse_ino_t parent, const char *name, bool dirp)
}

pnode = do_lookup_file (lo, parent, NULL);
if (pnode == NULL)
if (pnode == NULL || pnode->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -3000,7 +3006,7 @@ ovl_setxattr (fuse_req_t req, fuse_ino_t ino, const char *name,
}

node = do_lookup_file (lo, ino, NULL);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -3060,7 +3066,7 @@ ovl_removexattr (fuse_req_t req, fuse_ino_t ino, const char *name)
fprintf (stderr, "ovl_removexattr(ino=%" PRIu64 "s, name=%s)\n", ino, name);

node = do_lookup_file (lo, ino, NULL);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -3439,7 +3445,7 @@ ovl_getattr (fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi)
fprintf (stderr, "ovl_getattr(ino=%" PRIu64 ")\n", ino);

node = do_lookup_file (lo, ino, NULL);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -3473,7 +3479,7 @@ ovl_setattr (fuse_req_t req, fuse_ino_t ino, struct stat *attr, int to_set, stru
fprintf (stderr, "ovl_setattr(ino=%" PRIu64 "s, to_set=%d)\n", ino, to_set);

node = do_lookup_file (lo, ino, NULL);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -3655,7 +3661,7 @@ ovl_link (fuse_req_t req, fuse_ino_t ino, fuse_ino_t newparent, const char *newn
fprintf (stderr, "ovl_link(ino=%" PRIu64 "s, newparent=%" PRIu64 "s, newname=%s)\n", ino, newparent, newname);

node = do_lookup_file (lo, ino, NULL);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand All @@ -3669,7 +3675,7 @@ ovl_link (fuse_req_t req, fuse_ino_t ino, fuse_ino_t newparent, const char *newn
}

newparentnode = do_lookup_file (lo, newparent, NULL);
if (newparentnode == NULL)
if (newparentnode == NULL || newparentnode->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -3794,7 +3800,7 @@ ovl_symlink (fuse_req_t req, const char *link, fuse_ino_t parent, const char *na
fprintf (stderr, "ovl_symlink(link=%s, ino=%" PRIu64 "s, name=%s)\n", link, parent, name);

pnode = do_lookup_file (lo, parent, NULL);
if (pnode == NULL)
if (pnode == NULL || pnode->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -3882,7 +3888,7 @@ ovl_rename_exchange (fuse_req_t req, fuse_ino_t parent, const char *name,
char *tmp;

node = do_lookup_file (lo, parent, name);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -4243,7 +4249,7 @@ ovl_readlink (fuse_req_t req, fuse_ino_t ino)
fprintf (stderr, "ovl_readlink(ino=%" PRIu64 "s)\n", ino);

node = do_lookup_file (lo, ino, NULL);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -4581,7 +4587,7 @@ do_fsync (fuse_req_t req, fuse_ino_t ino, int datasync, int fd)
l = enter_big_lock ();

node = do_lookup_file (lo, ino, NULL);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -4660,7 +4666,7 @@ ovl_ioctl (fuse_req_t req, fuse_ino_t ino, unsigned int cmd, void *arg,
ino, cmd, arg, fi, flags, in_buf, in_bufsz, out_bufsz);

node = do_lookup_file (lo, ino, NULL);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -4730,7 +4736,7 @@ ovl_fallocate (fuse_req_t req, fuse_ino_t ino, int mode, off_t offset, off_t len
ino, mode, offset, length, fi);

node = do_lookup_file (lo, ino, NULL);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down Expand Up @@ -4782,14 +4788,14 @@ ovl_copy_file_range (fuse_req_t req, fuse_ino_t ino_in, off_t off_in, struct fus
ino_in, off_in, fi_in, ino_out, off_out, fi_out, len, flags);

node = do_lookup_file (lo, ino_in, NULL);
if (node == NULL)
if (node == NULL || node->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
}

dnode = do_lookup_file (lo, ino_out, NULL);
if (dnode == NULL)
if (dnode == NULL || dnode->whiteout)
{
fuse_reply_err (req, ENOENT);
return;
Expand Down

0 comments on commit 6044520

Please sign in to comment.