summaryrefslogtreecommitdiff
path: root/include/uapi/linux/magic.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-12-11 05:31:59 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-11 05:31:59 +0300
commit707c5960f102f8cdafb9406047b158abc71b391f (patch)
tree31d195b1c48cefa2d04da7cc801824f87a0a9887 /include/uapi/linux/magic.h
parentba00410b8131b23edfb0e09f8b6dd26c8eb621fb (diff)
parent3d3d35b1e94ec918fc0ae670663235bf197d8609 (diff)
downloadlinux-707c5960f102f8cdafb9406047b158abc71b391f.tar.xz
Merge branch 'nsfs' into for-next
Diffstat (limited to 'include/uapi/linux/magic.h')
-rw-r--r--include/uapi/linux/magic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 77c60311a6c6..7d664ea85ebd 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -72,5 +72,6 @@
#define MTD_INODE_FS_MAGIC 0x11307854
#define ANON_INODE_FS_MAGIC 0x09041934
#define BTRFS_TEST_MAGIC 0x73727279
+#define NSFS_MAGIC 0x6e736673
#endif /* __LINUX_MAGIC_H__ */