mirror of
https://github.com/libfuse/libfuse.git
synced 2026-07-07 14:47:41 +08:00
Sync fuse_kernel.h with linux-6.18
Signed-off-by: Bernd Schubert <bschubert@ddn.com> Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
This commit is contained in:
committed by
Bernd Schubert
parent
a18bf99212
commit
e58d50c44c
@@ -1138,6 +1138,7 @@ struct fuse_backing_map {
|
||||
#define FUSE_DEV_IOC_BACKING_OPEN _IOW(FUSE_DEV_IOC_MAGIC, 1, \
|
||||
struct fuse_backing_map)
|
||||
#define FUSE_DEV_IOC_BACKING_CLOSE _IOW(FUSE_DEV_IOC_MAGIC, 2, uint32_t)
|
||||
#define FUSE_DEV_IOC_SYNC_INIT _IO(FUSE_DEV_IOC_MAGIC, 3)
|
||||
|
||||
struct fuse_lseek_in {
|
||||
uint64_t fh;
|
||||
|
||||
@@ -55,7 +55,7 @@ static struct fuse_daemonize daemonize = {
|
||||
/* Watcher thread: polls for parent death or stop signal */
|
||||
static void *parent_watcher_thread(void *arg)
|
||||
{
|
||||
struct fuse_daemonize *di = arg;
|
||||
const struct fuse_daemonize *di = arg;
|
||||
struct pollfd pfd[2];
|
||||
|
||||
pfd[0].fd = di->death_pipe_rd;
|
||||
@@ -237,7 +237,6 @@ static void close_if_valid(int *fd)
|
||||
static void fuse_daemonize_early_signal(int status)
|
||||
{
|
||||
struct fuse_daemonize *dm = &daemonize;
|
||||
int rc;
|
||||
|
||||
if (!dm->active)
|
||||
errx(EINVAL, "%s: not active and cannot signal status", __func__);
|
||||
@@ -253,7 +252,8 @@ static void fuse_daemonize_early_signal(int status)
|
||||
|
||||
/* Signal status to parent */
|
||||
if (dm->signal_pipe_wr != -1) {
|
||||
rc = write(dm->signal_pipe_wr, &status, sizeof(status));
|
||||
int rc = write(dm->signal_pipe_wr, &status, sizeof(status));
|
||||
|
||||
if (rc != sizeof(status))
|
||||
fprintf(stderr, "%s: write failed\n", __func__);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user