aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorM. Mohan Kumar <mohan@in.ibm.com>2010-09-27 04:47:24 -0400
committerEric Van Hensbergen <ericvh@gmail.com>2010-10-28 10:08:47 -0400
commit368c09d2a303c39e9f37193b23e945e6754cf0a7 (patch)
tree3642173cbdfba8bcb32e85959eb69c1a6c8ebc11 /fs
parent1d769cd192fc8c4097b1e2cd41fdee6ba3d1b2af (diff)
9p: Use V9FS_MAGIC in statfs
Use V9FS_MAGIC as the file system type while filling kernel statfs strucutre instead of using host file system magic number. Also move the definition of V9FS_MAGIC from v9fs.h to standard magic.h file. Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com> Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/9p/v9fs.h2
-rw-r--r--fs/9p/vfs_super.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h
index 8bb7792afe2e..cb6396855e2d 100644
--- a/fs/9p/v9fs.h
+++ b/fs/9p/v9fs.h
@@ -117,8 +117,6 @@ void v9fs_session_close(struct v9fs_session_info *v9ses);
117void v9fs_session_cancel(struct v9fs_session_info *v9ses); 117void v9fs_session_cancel(struct v9fs_session_info *v9ses);
118void v9fs_session_begin_cancel(struct v9fs_session_info *v9ses); 118void v9fs_session_begin_cancel(struct v9fs_session_info *v9ses);
119 119
120#define V9FS_MAGIC 0x01021997
121
122/* other default globals */ 120/* other default globals */
123#define V9FS_PORT 564 121#define V9FS_PORT 564
124#define V9FS_DEFUSER "nobody" 122#define V9FS_DEFUSER "nobody"
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index 174643f4f901..48d4215c60a8 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -39,6 +39,7 @@
39#include <linux/sched.h> 39#include <linux/sched.h>
40#include <linux/slab.h> 40#include <linux/slab.h>
41#include <linux/statfs.h> 41#include <linux/statfs.h>
42#include <linux/magic.h>
42#include <net/9p/9p.h> 43#include <net/9p/9p.h>
43#include <net/9p/client.h> 44#include <net/9p/client.h>
44 45
@@ -256,7 +257,7 @@ static int v9fs_statfs(struct dentry *dentry, struct kstatfs *buf)
256 if (v9fs_proto_dotl(v9ses)) { 257 if (v9fs_proto_dotl(v9ses)) {
257 res = p9_client_statfs(fid, &rs); 258 res = p9_client_statfs(fid, &rs);
258 if (res == 0) { 259 if (res == 0) {
259 buf->f_type = rs.type; 260 buf->f_type = V9FS_MAGIC;
260 buf->f_bsize = rs.bsize; 261 buf->f_bsize = rs.bsize;
261 buf->f_blocks = rs.blocks; 262 buf->f_blocks = rs.blocks;
262 buf->f_bfree = rs.bfree; 263 buf->f_bfree = rs.bfree;