diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 09:58:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 09:58:38 -0700 |
| commit | e9c0f1529c9022afbab16a442382aa9a84a79c41 (patch) | |
| tree | 173e99d46283f5d814bf4407728ad0d2ea702100 /fs/9p | |
| parent | vfs: fix d_ancestor() case in d_materialize_unique (diff) | |
| parent | 9p: statfs should not override server f_type (diff) | |
| download | linux-dev-e9c0f1529c9022afbab16a442382aa9a84a79c41.tar.xz linux-dev-e9c0f1529c9022afbab16a442382aa9a84a79c41.zip | |
Merge tag 'for-linus-3.4-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9p changes for the 3.4 merge window from Eric Van Hensbergen.
* tag 'for-linus-3.4-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: statfs should not override server f_type
net/9p: handle flushed Tclunk/Tremove
net/9p: don't allow Tflush to be interrupted
Diffstat (limited to 'fs/9p')
| -rw-r--r-- | fs/9p/vfs_super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c index 10b7d3c9dba8..8c92a9ba8330 100644 --- a/fs/9p/vfs_super.c +++ b/fs/9p/vfs_super.c @@ -259,7 +259,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 = V9FS_MAGIC; + buf->f_type = rs.type; buf->f_bsize = rs.bsize; buf->f_blocks = rs.blocks; buf->f_bfree = rs.bfree; |