Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

+216 -220

1 changed file

expand all

include

uapi

linux

fuse.h

+216 -220

include/uapi/linux/fuse.h

··· 95 95 #ifndef _LINUX_FUSE_H 96 96 #define _LINUX_FUSE_H 97 97 98 - #ifdef __linux__ 98 + #ifdef __KERNEL__ 99 99 #include <linux/types.h> 100 100 #else 101 101 #include <stdint.h> 102 - #define __u64 uint64_t 103 - #define __s64 int64_t 104 - #define __u32 uint32_t 105 - #define __s32 int32_t 106 - #define __u16 uint16_t 107 102 #endif 108 103 109 104 /* ··· 134 139 userspace works under 64bit kernels */ 135 140 136 141 struct fuse_attr { 137 - __u64 ino; 138 - __u64 size; 139 - __u64 blocks; 140 - __u64 atime; 141 - __u64 mtime; 142 - __u64 ctime; 143 - __u32 atimensec; 144 - __u32 mtimensec; 145 - __u32 ctimensec; 146 - __u32 mode; 147 - __u32 nlink; 148 - __u32 uid; 149 - __u32 gid; 150 - __u32 rdev; 151 - __u32 blksize; 152 - __u32 padding; 142 + uint64_t ino; 143 + uint64_t size; 144 + uint64_t blocks; 145 + uint64_t atime; 146 + uint64_t mtime; 147 + uint64_t ctime; 148 + uint32_t atimensec; 149 + uint32_t mtimensec; 150 + uint32_t ctimensec; 151 + uint32_t mode; 152 + uint32_t nlink; 153 + uint32_t uid; 154 + uint32_t gid; 155 + uint32_t rdev; 156 + uint32_t blksize; 157 + uint32_t padding; 153 158 }; 154 159 155 160 struct fuse_kstatfs { 156 - __u64 blocks; 157 - __u64 bfree; 158 - __u64 bavail; 159 - __u64 files; 160 - __u64 ffree; 161 - __u32 bsize; 162 - __u32 namelen; 163 - __u32 frsize; 164 - __u32 padding; 165 - __u32 spare[6]; 161 + uint64_t blocks; 162 + uint64_t bfree; 163 + uint64_t bavail; 164 + uint64_t files; 165 + uint64_t ffree; 166 + uint32_t bsize; 167 + uint32_t namelen; 168 + uint32_t frsize; 169 + uint32_t padding; 170 + uint32_t spare[6]; 166 171 }; 167 172 168 173 struct fuse_file_lock { 169 - __u64 start; 170 - __u64 end; 171 - __u32 type; 172 - __u32 pid; /* tgid */ 174 + uint64_t start; 175 + uint64_t end; 176 + uint32_t type; 177 + uint32_t pid; /* tgid */ 173 178 }; 174 179 175 180 /** ··· 359 364 #define FUSE_COMPAT_ENTRY_OUT_SIZE 120 360 365 361 366 struct fuse_entry_out { 362 - __u64 nodeid; /* Inode ID */ 363 - __u64 generation; /* Inode generation: nodeid:gen must 364 - be unique for the fs's lifetime */ 365 - __u64 entry_valid; /* Cache timeout for the name */ 366 - __u64 attr_valid; /* Cache timeout for the attributes */ 367 - __u32 entry_valid_nsec; 368 - __u32 attr_valid_nsec; 367 + uint64_t nodeid; /* Inode ID */ 368 + uint64_t generation; /* Inode generation: nodeid:gen must 369 + be unique for the fs's lifetime */ 370 + uint64_t entry_valid; /* Cache timeout for the name */ 371 + uint64_t attr_valid; /* Cache timeout for the attributes */ 372 + uint32_t entry_valid_nsec; 373 + uint32_t attr_valid_nsec; 369 374 struct fuse_attr attr; 370 375 }; 371 376 372 377 struct fuse_forget_in { 373 - __u64 nlookup; 378 + uint64_t nlookup; 374 379 }; 375 380 376 381 struct fuse_forget_one { 377 - __u64 nodeid; 378 - __u64 nlookup; 382 + uint64_t nodeid; 383 + uint64_t nlookup; 379 384 }; 380 385 381 386 struct fuse_batch_forget_in { 382 - __u32 count; 383 - __u32 dummy; 387 + uint32_t count; 388 + uint32_t dummy; 384 389 }; 385 390 386 391 struct fuse_getattr_in { 387 - __u32 getattr_flags; 388 - __u32 dummy; 389 - __u64 fh; 392 + uint32_t getattr_flags; 393 + uint32_t dummy; 394 + uint64_t fh; 390 395 }; 391 396 392 397 #define FUSE_COMPAT_ATTR_OUT_SIZE 96 393 398 394 399 struct fuse_attr_out { 395 - __u64 attr_valid; /* Cache timeout for the attributes */ 396 - __u32 attr_valid_nsec; 397 - __u32 dummy; 400 + uint64_t attr_valid; /* Cache timeout for the attributes */ 401 + uint32_t attr_valid_nsec; 402 + uint32_t dummy; 398 403 struct fuse_attr attr; 399 404 }; 400 405 401 406 #define FUSE_COMPAT_MKNOD_IN_SIZE 8 402 407 403 408 struct fuse_mknod_in { 404 - __u32 mode; 405 - __u32 rdev; 406 - __u32 umask; 407 - __u32 padding; 409 + uint32_t mode; 410 + uint32_t rdev; 411 + uint32_t umask; 412 + uint32_t padding; 408 413 }; 409 414 410 415 struct fuse_mkdir_in { 411 - __u32 mode; 412 - __u32 umask; 416 + uint32_t mode; 417 + uint32_t umask; 413 418 }; 414 419 415 420 struct fuse_rename_in { 416 - __u64 newdir; 421 + uint64_t newdir; 417 422 }; 418 423 419 424 struct fuse_link_in { 420 - __u64 oldnodeid; 425 + uint64_t oldnodeid; 421 426 }; 422 427 423 428 struct fuse_setattr_in { 424 - __u32 valid; 425 - __u32 padding; 426 - __u64 fh; 427 - __u64 size; 428 - __u64 lock_owner; 429 - __u64 atime; 430 - __u64 mtime; 431 - __u64 unused2; 432 - __u32 atimensec; 433 - __u32 mtimensec; 434 - __u32 unused3; 435 - __u32 mode; 436 - __u32 unused4; 437 - __u32 uid; 438 - __u32 gid; 439 - __u32 unused5; 429 + uint32_t valid; 430 + uint32_t padding; 431 + uint64_t fh; 432 + uint64_t size; 433 + uint64_t lock_owner; 434 + uint64_t atime; 435 + uint64_t mtime; 436 + uint64_t unused2; 437 + uint32_t atimensec; 438 + uint32_t mtimensec; 439 + uint32_t unused3; 440 + uint32_t mode; 441 + uint32_t unused4; 442 + uint32_t uid; 443 + uint32_t gid; 444 + uint32_t unused5; 440 445 }; 441 446 442 447 struct fuse_open_in { 443 - __u32 flags; 444 - __u32 unused; 448 + uint32_t flags; 449 + uint32_t unused; 445 450 }; 446 451 447 452 struct fuse_create_in { 448 - __u32 flags; 449 - __u32 mode; 450 - __u32 umask; 451 - __u32 padding; 453 + uint32_t flags; 454 + uint32_t mode; 455 + uint32_t umask; 456 + uint32_t padding; 452 457 }; 453 458 454 459 struct fuse_open_out { 455 - __u64 fh; 456 - __u32 open_flags; 457 - __u32 padding; 460 + uint64_t fh; 461 + uint32_t open_flags; 462 + uint32_t padding; 458 463 }; 459 464 460 465 struct fuse_release_in { 461 - __u64 fh; 462 - __u32 flags; 463 - __u32 release_flags; 464 - __u64 lock_owner; 466 + uint64_t fh; 467 + uint32_t flags; 468 + uint32_t release_flags; 469 + uint64_t lock_owner; 465 470 }; 466 471 467 472 struct fuse_flush_in { 468 - __u64 fh; 469 - __u32 unused; 470 - __u32 padding; 471 - __u64 lock_owner; 473 + uint64_t fh; 474 + uint32_t unused; 475 + uint32_t padding; 476 + uint64_t lock_owner; 472 477 }; 473 478 474 479 struct fuse_read_in { 475 - __u64 fh; 476 - __u64 offset; 477 - __u32 size; 478 - __u32 read_flags; 479 - __u64 lock_owner; 480 - __u32 flags; 481 - __u32 padding; 480 + uint64_t fh; 481 + uint64_t offset; 482 + uint32_t size; 483 + uint32_t read_flags; 484 + uint64_t lock_owner; 485 + uint32_t flags; 486 + uint32_t padding; 482 487 }; 483 488 484 489 #define FUSE_COMPAT_WRITE_IN_SIZE 24 485 490 486 491 struct fuse_write_in { 487 - __u64 fh; 488 - __u64 offset; 489 - __u32 size; 490 - __u32 write_flags; 491 - __u64 lock_owner; 492 - __u32 flags; 493 - __u32 padding; 492 + uint64_t fh; 493 + uint64_t offset; 494 + uint32_t size; 495 + uint32_t write_flags; 496 + uint64_t lock_owner; 497 + uint32_t flags; 498 + uint32_t padding; 494 499 }; 495 500 496 501 struct fuse_write_out { 497 - __u32 size; 498 - __u32 padding; 502 + uint32_t size; 503 + uint32_t padding; 499 504 }; 500 505 501 506 #define FUSE_COMPAT_STATFS_SIZE 48 ··· 505 510 }; 506 511 507 512 struct fuse_fsync_in { 508 - __u64 fh; 509 - __u32 fsync_flags; 510 - __u32 padding; 513 + uint64_t fh; 514 + uint32_t fsync_flags; 515 + uint32_t padding; 511 516 }; 512 517 513 518 struct fuse_setxattr_in { 514 - __u32 size; 515 - __u32 flags; 519 + uint32_t size; 520 + uint32_t flags; 516 521 }; 517 522 518 523 struct fuse_getxattr_in { 519 - __u32 size; 520 - __u32 padding; 524 + uint32_t size; 525 + uint32_t padding; 521 526 }; 522 527 523 528 struct fuse_getxattr_out { 524 - __u32 size; 525 - __u32 padding; 529 + uint32_t size; 530 + uint32_t padding; 526 531 }; 527 532 528 533 struct fuse_lk_in { 529 - __u64 fh; 530 - __u64 owner; 534 + uint64_t fh; 535 + uint64_t owner; 531 536 struct fuse_file_lock lk; 532 - __u32 lk_flags; 533 - __u32 padding; 537 + uint32_t lk_flags; 538 + uint32_t padding; 534 539 }; 535 540 536 541 struct fuse_lk_out { ··· 538 543 }; 539 544 540 545 struct fuse_access_in { 541 - __u32 mask; 542 - __u32 padding; 546 + uint32_t mask; 547 + uint32_t padding; 543 548 }; 544 549 545 550 struct fuse_init_in { 546 - __u32 major; 547 - __u32 minor; 548 - __u32 max_readahead; 549 - __u32 flags; 551 + uint32_t major; 552 + uint32_t minor; 553 + uint32_t max_readahead; 554 + uint32_t flags; 550 555 }; 551 556 552 557 struct fuse_init_out { 553 - __u32 major; 554 - __u32 minor; 555 - __u32 max_readahead; 556 - __u32 flags; 557 - __u16 max_background; 558 - __u16 congestion_threshold; 559 - __u32 max_write; 558 + uint32_t major; 559 + uint32_t minor; 560 + uint32_t max_readahead; 561 + uint32_t flags; 562 + uint16_t max_background; 563 + uint16_t congestion_threshold; 564 + uint32_t max_write; 560 565 }; 561 566 562 567 #define CUSE_INIT_INFO_MAX 4096 563 568 564 569 struct cuse_init_in { 565 - __u32 major; 566 - __u32 minor; 567 - __u32 unused; 568 - __u32 flags; 570 + uint32_t major; 571 + uint32_t minor; 572 + uint32_t unused; 573 + uint32_t flags; 569 574 }; 570 575 571 576 struct cuse_init_out { 572 - __u32 major; 573 - __u32 minor; 574 - __u32 unused; 575 - __u32 flags; 576 - __u32 max_read; 577 - __u32 max_write; 578 - __u32 dev_major; /* chardev major */ 579 - __u32 dev_minor; /* chardev minor */ 580 - __u32 spare[10]; 577 + uint32_t major; 578 + uint32_t minor; 579 + uint32_t unused; 580 + uint32_t flags; 581 + uint32_t max_read; 582 + uint32_t max_write; 583 + uint32_t dev_major; /* chardev major */ 584 + uint32_t dev_minor; /* chardev minor */ 585 + uint32_t spare[10]; 581 586 }; 582 587 583 588 struct fuse_interrupt_in { 584 - __u64 unique; 589 + uint64_t unique; 585 590 }; 586 591 587 592 struct fuse_bmap_in { 588 - __u64 block; 589 - __u32 blocksize; 590 - __u32 padding; 593 + uint64_t block; 594 + uint32_t blocksize; 595 + uint32_t padding; 591 596 }; 592 597 593 598 struct fuse_bmap_out { 594 - __u64 block; 599 + uint64_t block; 595 600 }; 596 601 597 602 struct fuse_ioctl_in { 598 - __u64 fh; 599 - __u32 flags; 600 - __u32 cmd; 601 - __u64 arg; 602 - __u32 in_size; 603 - __u32 out_size; 603 + uint64_t fh; 604 + uint32_t flags; 605 + uint32_t cmd; 606 + uint64_t arg; 607 + uint32_t in_size; 608 + uint32_t out_size; 604 609 }; 605 610 606 611 struct fuse_ioctl_iovec { 607 - __u64 base; 608 - __u64 len; 612 + uint64_t base; 613 + uint64_t len; 609 614 }; 610 615 611 616 struct fuse_ioctl_out { 612 - __s32 result; 613 - __u32 flags; 614 - __u32 in_iovs; 615 - __u32 out_iovs; 617 + int32_t result; 618 + uint32_t flags; 619 + uint32_t in_iovs; 620 + uint32_t out_iovs; 616 621 }; 617 622 618 623 struct fuse_poll_in { 619 - __u64 fh; 620 - __u64 kh; 621 - __u32 flags; 622 - __u32 events; 624 + uint64_t fh; 625 + uint64_t kh; 626 + uint32_t flags; 627 + uint32_t events; 623 628 }; 624 629 625 630 struct fuse_poll_out { 626 - __u32 revents; 627 - __u32 padding; 631 + uint32_t revents; 632 + uint32_t padding; 628 633 }; 629 634 630 635 struct fuse_notify_poll_wakeup_out { 631 - __u64 kh; 636 + uint64_t kh; 632 637 }; 633 638 634 639 struct fuse_fallocate_in { 635 - __u64 fh; 636 - __u64 offset; 637 - __u64 length; 638 - __u32 mode; 639 - __u32 padding; 640 + uint64_t fh; 641 + uint64_t offset; 642 + uint64_t length; 643 + uint32_t mode; 644 + uint32_t padding; 640 645 }; 641 646 642 647 struct fuse_in_header { 643 - __u32 len; 644 - __u32 opcode; 645 - __u64 unique; 646 - __u64 nodeid; 647 - __u32 uid; 648 - __u32 gid; 649 - __u32 pid; 650 - __u32 padding; 648 + uint32_t len; 649 + uint32_t opcode; 650 + uint64_t unique; 651 + uint64_t nodeid; 652 + uint32_t uid; 653 + uint32_t gid; 654 + uint32_t pid; 655 + uint32_t padding; 651 656 }; 652 657 653 658 struct fuse_out_header { 654 - __u32 len; 655 - __s32 error; 656 - __u64 unique; 659 + uint32_t len; 660 + int32_t error; 661 + uint64_t unique; 657 662 }; 658 663 659 664 struct fuse_dirent { 660 - __u64 ino; 661 - __u64 off; 662 - __u32 namelen; 663 - __u32 type; 665 + uint64_t ino; 666 + uint64_t off; 667 + uint32_t namelen; 668 + uint32_t type; 664 669 char name[]; 665 670 }; 666 671 667 672 #define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name) 668 - #define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1)) 673 + #define FUSE_DIRENT_ALIGN(x) \ 674 + (((x) + sizeof(uint64_t) - 1) & ~(sizeof(uint64_t) - 1)) 669 675 #define FUSE_DIRENT_SIZE(d) \ 670 676 FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen) 671 677 ··· 681 685 FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET_DIRENTPLUS + (d)->dirent.namelen) 682 686 683 687 struct fuse_notify_inval_inode_out { 684 - __u64 ino; 685 - __s64 off; 686 - __s64 len; 688 + uint64_t ino; 689 + int64_t off; 690 + int64_t len; 687 691 }; 688 692 689 693 struct fuse_notify_inval_entry_out { 690 - __u64 parent; 691 - __u32 namelen; 692 - __u32 padding; 694 + uint64_t parent; 695 + uint32_t namelen; 696 + uint32_t padding; 693 697 }; 694 698 695 699 struct fuse_notify_delete_out { 696 - __u64 parent; 697 - __u64 child; 698 - __u32 namelen; 699 - __u32 padding; 700 + uint64_t parent; 701 + uint64_t child; 702 + uint32_t namelen; 703 + uint32_t padding; 700 704 }; 701 705 702 706 struct fuse_notify_store_out { 703 - __u64 nodeid; 704 - __u64 offset; 705 - __u32 size; 706 - __u32 padding; 707 + uint64_t nodeid; 708 + uint64_t offset; 709 + uint32_t size; 710 + uint32_t padding; 707 711 }; 708 712 709 713 struct fuse_notify_retrieve_out { 710 - __u64 notify_unique; 711 - __u64 nodeid; 712 - __u64 offset; 713 - __u32 size; 714 - __u32 padding; 714 + uint64_t notify_unique; 715 + uint64_t nodeid; 716 + uint64_t offset; 717 + uint32_t size; 718 + uint32_t padding; 715 719 }; 716 720 717 721 /* Matches the size of fuse_write_in */ 718 722 struct fuse_notify_retrieve_in { 719 - __u64 dummy1; 720 - __u64 offset; 721 - __u32 size; 722 - __u32 dummy2; 723 - __u64 dummy3; 724 - __u64 dummy4; 723 + uint64_t dummy1; 724 + uint64_t offset; 725 + uint32_t size; 726 + uint32_t dummy2; 727 + uint64_t dummy3; 728 + uint64_t dummy4; 725 729 }; 726 730 727 731 #endif /* _LINUX_FUSE_H */

Configure Feed

Configure Feed