diff --git a/[refs] b/[refs] index f36514d23c53..7ebf9a478b05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d769cd192fc8c4097b1e2cd41fdee6ba3d1b2af +refs/heads/master: 368c09d2a303c39e9f37193b23e945e6754cf0a7 diff --git a/trunk/fs/9p/v9fs.h b/trunk/fs/9p/v9fs.h index 8bb7792afe2e..cb6396855e2d 100644 --- a/trunk/fs/9p/v9fs.h +++ b/trunk/fs/9p/v9fs.h @@ -117,8 +117,6 @@ void v9fs_session_close(struct v9fs_session_info *v9ses); void v9fs_session_cancel(struct v9fs_session_info *v9ses); void v9fs_session_begin_cancel(struct v9fs_session_info *v9ses); -#define V9FS_MAGIC 0x01021997 - /* other default globals */ #define V9FS_PORT 564 #define V9FS_DEFUSER "nobody" diff --git a/trunk/fs/9p/vfs_super.c b/trunk/fs/9p/vfs_super.c index 174643f4f901..48d4215c60a8 100644 --- a/trunk/fs/9p/vfs_super.c +++ b/trunk/fs/9p/vfs_super.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -256,7 +257,7 @@ static int v9fs_statfs(struct dentry *dentry, struct kstatfs *buf) if (v9fs_proto_dotl(v9ses)) { res = p9_client_statfs(fid, &rs); if (res == 0) { - buf->f_type = rs.type; + buf->f_type = V9FS_MAGIC; buf->f_bsize = rs.bsize; buf->f_blocks = rs.blocks; buf->f_bfree = rs.bfree; diff --git a/trunk/include/linux/magic.h b/trunk/include/linux/magic.h index eb9800f05782..ff690d05f129 100644 --- a/trunk/include/linux/magic.h +++ b/trunk/include/linux/magic.h @@ -57,5 +57,6 @@ #define DEVPTS_SUPER_MAGIC 0x1cd1 #define SOCKFS_MAGIC 0x534F434B +#define V9FS_MAGIC 0x01021997 #endif /* __LINUX_MAGIC_H__ */