diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-05-03 22:46:40 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-05-03 22:46:40 -0400 |
| commit | 898bfc1d46bd76f8ea2a0fbd239dd2073efe2aa3 (patch) | |
| tree | e6e666085abe674dbf6292555961fe0a0f2e2d2f /include/linux/fuse.h | |
| parent | 08162e6a23d476544adfe1164afe9ea8b34ab859 (diff) | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
Merge tag 'v3.4-rc5' into next
Linux 3.4-rc5
Merge to pull in prerequisite change for Smack:
86812bb0de1a3758dc6c7aa01a763158a7c0638a
Requested by Casey.
Diffstat (limited to 'include/linux/fuse.h')
| -rw-r--r-- | include/linux/fuse.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fuse.h b/include/linux/fuse.h index 8ba2c9460b28..8f2ab8fef929 100644 --- a/include/linux/fuse.h +++ b/include/linux/fuse.h | |||
| @@ -593,7 +593,7 @@ struct fuse_dirent { | |||
| 593 | __u64 off; | 593 | __u64 off; |
| 594 | __u32 namelen; | 594 | __u32 namelen; |
| 595 | __u32 type; | 595 | __u32 type; |
| 596 | char name[0]; | 596 | char name[]; |
| 597 | }; | 597 | }; |
| 598 | 598 | ||
| 599 | #define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name) | 599 | #define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name) |