diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-19 02:29:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-19 02:29:05 +0200 |
| commit | dbfad21422f8d2c0866185b3e449c4a6ebaec4e2 (patch) | |
| tree | a30de27f59ddce92ba9b950d5bb1b20ff23191b4 /include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
| parent | fuse: use flexible array in fuse.h (diff) | |
| download | linux-dbfad21422f8d2c0866185b3e449c4a6ebaec4e2.tar.xz linux-dbfad21422f8d2c0866185b3e449c4a6ebaec4e2.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse updates from Miklos Szeredi.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: use flexible array in fuse.h
fuse: allow nanosecond granularity
fuse: O_DIRECT support for files
fuse: fix nlink after unlink
Diffstat (limited to 'include')
| -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 { __u64 off; __u32 namelen; __u32 type; - char name[0]; + char name[]; }; #define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name) |