@@ -5131,12 +5131,6 @@ ovl_fsyncdir (fuse_req_t req, fuse_ino_t ino, int datasync, struct fuse_file_inf
5131
5131
return do_fsync (req , ino , datasync , -1 );
5132
5132
}
5133
5133
5134
- static int
5135
- direct_ioctl (struct ovl_layer * l , int fd , int cmd , unsigned long * r )
5136
- {
5137
- return ioctl (fd , cmd , & r );
5138
- }
5139
-
5140
5134
static void
5141
5135
ovl_ioctl (fuse_req_t req , fuse_ino_t ino , int cmd , void * arg ,
5142
5136
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,
5147
5141
cleanup_close int cleaned_fd = -1 ;
5148
5142
struct ovl_node * node ;
5149
5143
int fd = -1 ;
5150
- unsigned long r ;
5144
+ int r = 0 ;
5151
5145
5152
5146
if (flags & FUSE_IOCTL_COMPAT )
5153
5147
{
@@ -5203,7 +5197,7 @@ ovl_ioctl (fuse_req_t req, fuse_ino_t ino, int cmd, void *arg,
5203
5197
5204
5198
l = release_big_lock ();
5205
5199
5206
- if (direct_ioctl ( node -> layer , fd , cmd , & r ) < 0 )
5200
+ if (ioctl ( fd , cmd , & r , sizeof ( r ) ) < 0 )
5207
5201
fuse_reply_err (req , errno );
5208
5202
else
5209
5203
fuse_reply_ioctl (req , 0 , & r , out_bufsz ? sizeof (r ) : 0 );
0 commit comments