diff options
| author | Colin Cross <ccross@android.com> | 2012-05-07 18:20:34 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-05-07 18:20:34 -0700 |
| commit | f02fac63308349b1dbde468adfd084fdb560eeae (patch) | |
| tree | 35c39e5c3c70e40c52bc18c07a88dd7a1becb649 /fs/btrfs/ioctl.h | |
| parent | 6ff6845be02be8d53da28d2333a015d54b1234db (diff) | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
Merge commit 'v3.4-rc6' into android-3.4
Conflicts:
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
Change-Id: If4f371a21c052fa597d107c44b128a093e4a8b91
Diffstat (limited to 'fs/btrfs/ioctl.h')
| -rw-r--r-- | fs/btrfs/ioctl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h index 4f69028a68c..086e6bdae1c 100644 --- a/fs/btrfs/ioctl.h +++ b/fs/btrfs/ioctl.h @@ -252,7 +252,7 @@ struct btrfs_data_container { struct btrfs_ioctl_ino_path_args { __u64 inum; /* in */ - __u32 size; /* in */ + __u64 size; /* in */ __u64 reserved[4]; /* struct btrfs_data_container *fspath; out */ __u64 fspath; /* out */ @@ -260,7 +260,7 @@ struct btrfs_ioctl_ino_path_args { struct btrfs_ioctl_logical_ino_args { __u64 logical; /* in */ - __u32 size; /* in */ + __u64 size; /* in */ __u64 reserved[4]; /* struct btrfs_data_container *inodes; out */ __u64 inodes; |