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

main: fix type for ioctl

Browse Source 
fuse_reply_ioctl expects a int.

Closes: https://github.com/containers/fuse-overlayfs/issues/330

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2022-01-17 17:49:44 +01:00
parent 6d4dbb88fc
commit 0476f8464b
No known key found for this signature in database
GPG Key ID: 67E38F7A8BA21772
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.c
View File

@ -5131,12 +5131,6 @@ ovl_fsyncdir (fuse_req_t req, fuse_ino_t ino, int datasync, struct fuse_file_inf
return do_fsync (req, ino, datasync, -1); return do_fsync (req, ino, datasync, -1);
} }
static int
direct_ioctl (struct ovl_layer *l, int fd, int cmd, unsigned long *r)
{
return ioctl (fd, cmd, &r);
}
static void static void
ovl_ioctl (fuse_req_t req, fuse_ino_t ino, int cmd, void *arg, ovl_ioctl (fuse_req_t req, fuse_ino_t ino, int cmd, void *arg,
struct fuse_file_info *fi, unsigned int flags, struct fuse_file_info *fi, unsigned int flags,
@ -5147,7 +5141,7 @@ ovl_ioctl (fuse_req_t req, fuse_ino_t ino, int cmd, void *arg,
cleanup_close int cleaned_fd = -1; cleanup_close int cleaned_fd = -1;
struct ovl_node *node; struct ovl_node *node;
int fd = -1; int fd = -1;
unsigned long r; int r = 0;
if (flags & FUSE_IOCTL_COMPAT) if (flags & FUSE_IOCTL_COMPAT)
{ {
@ -5203,7 +5197,7 @@ ovl_ioctl (fuse_req_t req, fuse_ino_t ino, int cmd, void *arg,
l = release_big_lock (); l = release_big_lock ();
if (direct_ioctl (node->layer, fd, cmd, &r) < 0) if (ioctl (fd, cmd, &r, sizeof (r)) < 0)
fuse_reply_err (req, errno); fuse_reply_err (req, errno);
else else
fuse_reply_ioctl (req, 0, &r, out_bufsz ? sizeof (r) : 0); fuse_reply_ioctl (req, 0, &r, out_bufsz ? sizeof (r) : 0);