diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | include/linux/fuse.h | 12 | ||||
| -rw-r--r-- | kernel/fuse_i.h | 2 | ||||
| -rw-r--r-- | lib/fuse.c | 14 | ||||
| -rw-r--r-- | lib/fuse_i.h | 2 |
5 files changed, 17 insertions, 15 deletions
@@ -2,6 +2,8 @@ * Add PID to fuse_context. Patch by Steven James + * Change file handle type to 'unsigned long' in kernel interface + 2004-09-22 Miklos Szeredi <miklos@szeredi.hu> * A slight API change: fuse_get_context() doesn't need the "fuse" diff --git a/include/linux/fuse.h b/include/linux/fuse.h index 4dfd61b..21ecc47 100644 --- a/include/linux/fuse.h +++ b/include/linux/fuse.h @@ -144,27 +144,27 @@ struct fuse_open_in { }; struct fuse_open_out { - unsigned int fh; + unsigned long fh; }; struct fuse_release_in { - unsigned int fh; + unsigned long fh; unsigned int flags; }; struct fuse_flush_in { - unsigned int fh; + unsigned long fh; }; struct fuse_read_in { - unsigned int fh; + unsigned long fh; unsigned long long offset; unsigned int size; }; struct fuse_write_in { int writepage; - unsigned int fh; + unsigned long fh; unsigned long long offset; unsigned int size; }; @@ -178,7 +178,7 @@ struct fuse_statfs_out { }; struct fuse_fsync_in { - unsigned int fh; + unsigned long fh; int datasync; }; diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index d92e795..23a4f77 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -82,7 +82,7 @@ struct fuse_inode { /** FUSE specific file data */ struct fuse_file { struct fuse_req *release_req; - unsigned int fh; + unsigned long fh; struct list_head ff_list; }; @@ -1043,7 +1043,7 @@ static void do_open(struct fuse *f, struct fuse_in_header *in, f->fh_ctr ++; outarg.fh = f->fh_ctr; if (f->flags & FUSE_DEBUG) { - printf("OPEN[%u] flags: 0x%x\n", outarg.fh, arg->flags); + printf("OPEN[%lu] flags: 0x%x\n", outarg.fh, arg->flags); fflush(stdout); } @@ -1073,7 +1073,7 @@ static void do_flush(struct fuse *f, struct fuse_in_header *in, path = get_path(f, in->ino); if (path != NULL) { if (f->flags & FUSE_DEBUG) { - printf("FLUSH[%u]\n", arg->fh); + printf("FLUSH[%lu]\n", arg->fh); fflush(stdout); } res = -ENOSYS; @@ -1098,7 +1098,7 @@ static void do_release(struct fuse *f, struct fuse_in_header *in, path = get_path(f, in->ino); if (path != NULL) { if (f->flags & FUSE_DEBUG) { - printf("RELEASE[%u]\n", arg->fh); + printf("RELEASE[%lu]\n", arg->fh); fflush(stdout); } if (f->op.release) @@ -1131,7 +1131,7 @@ static void do_read(struct fuse *f, struct fuse_in_header *in, path = get_path(f, in->ino); if (path != NULL) { if (f->flags & FUSE_DEBUG) { - printf("READ[%u] %u bytes from %llu\n", arg->fh, arg->size, + printf("READ[%lu] %u bytes from %llu\n", arg->fh, arg->size, arg->offset); fflush(stdout); } @@ -1147,7 +1147,7 @@ static void do_read(struct fuse *f, struct fuse_in_header *in, size = res; res = 0; if (f->flags & FUSE_DEBUG) { - printf(" READ[%u] %u bytes\n", arg->fh, size); + printf(" READ[%lu] %u bytes\n", arg->fh, size); fflush(stdout); } } @@ -1172,7 +1172,7 @@ static void do_write(struct fuse *f, struct fuse_in_header *in, path = get_path(f, in->ino); if (path != NULL) { if (f->flags & FUSE_DEBUG) { - printf("WRITE%s[%u] %u bytes to %llu\n", + printf("WRITE%s[%lu] %u bytes to %llu\n", arg->writepage ? "PAGE" : "", arg->fh, arg->size, arg->offset); fflush(stdout); @@ -1238,7 +1238,7 @@ static void do_fsync(struct fuse *f, struct fuse_in_header *in, path = get_path(f, in->ino); if (path != NULL) { if (f->flags & FUSE_DEBUG) { - printf("FSYNC[%u]\n", inarg->fh); + printf("FSYNC[%lu]\n", inarg->fh); fflush(stdout); } res = -ENOSYS; diff --git a/lib/fuse_i.h b/lib/fuse_i.h index c1aaa4c..2c7e2d0 100644 --- a/lib/fuse_i.h +++ b/lib/fuse_i.h @@ -47,7 +47,7 @@ struct fuse { fino_t ctr; unsigned int generation; unsigned int hidectr; - unsigned int fh_ctr; + unsigned long fh_ctr; pthread_mutex_t lock; int numworker; int numavail; |