[GIT PULL] 9p changes fro merge window

From: Eric Van Hensbergen
Date: Mon Oct 24 2011 - 12:29:17 EST


The following changes since commit c3b92c8787367a8bb53d57d9789b558f1295cc96:

Linux 3.1 (2011-10-24 09:10:05 +0200)

are available in the git repository at:
git://github.com/ericvh/linux.git for-next

Aneesh Kumar K.V (4):
fs/9p: Update zero-copy implementation in 9p
fs/9p: inode file operation is properly initialized init_special_inode
fs/9p: Cleanup option parsing in 9p
net/9p: Convert net/9p protocol dumps to tracepoints

Dan Carpenter (2):
9p: move dereference after NULL check
fs/9p: change an int to unsigned int

Nicolae Mogoreanu (1):
9p: fix 9p.txt to advertise msize instead of maxdata

Documentation/filesystems/9p.txt | 2 +-
fs/9p/v9fs.c | 33 ++-
fs/9p/vfs_dir.c | 14 +-
fs/9p/vfs_inode.c | 2 -
include/net/9p/9p.h | 14 +-
include/net/9p/client.h | 8 +-
include/net/9p/transport.h | 10 +-
include/trace/events/9p.h | 176 ++++++++++++++
net/9p/client.c | 469 +++++++++++++++++++++++++++-----------
net/9p/protocol.c | 99 +-------
net/9p/protocol.h | 4 +-
net/9p/trans_common.c | 53 ++---
net/9p/trans_common.h | 21 +--
net/9p/trans_virtio.c | 319 +++++++++++++++-----------
14 files changed, 772 insertions(+), 452 deletions(-)
create mode 100644 include/trace/events/9p.h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/