summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-18 17:29:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-18 17:29:05 -0700
commitdbfad21422f8d2c0866185b3e449c4a6ebaec4e2 (patch)
treea30de27f59ddce92ba9b950d5bb1b20ff23191b4 /include
parent743e89ebc0215900040b1c2d1563d70a22ac2cb0 (diff)
parentc628ee67fb15a0d8d48351aa2e487c5f14779785 (diff)
downloadlinux-3.10-dbfad21422f8d2c0866185b3e449c4a6ebaec4e2.tar.gz
linux-3.10-dbfad21422f8d2c0866185b3e449c4a6ebaec4e2.tar.bz2
linux-3.10-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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 8ba2c9460b2..8f2ab8fef92 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)