Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: fix a race condition bug in umount which caused a segfault
  9p: re-enable mount time debug option
  9p: cache meta-data when cache=loose
  net/9p: set error to EREMOTEIO if trans->write returns zero
  net/9p: change net/9p module name to 9pnet
  9p: Reorganization of 9p file system code

1 files changed, 0 insertions, 6 deletions

diff --git a/fs/9p/Makefile b/fs/9p/Makefile
index 87897f84dfb6..bc7f0d1551e6 100644
--- a/fs/9p/Makefile
+++ b/fs/9p/Makefile
@@ -1,18 +1,12 @@
 obj-$(CONFIG_9P_FS) := 9p.o
 
 9p-objs := \
-        trans_fd.o \
-        mux.o \
-        fcall.o \
-        conv.o \
         vfs_super.o \
         vfs_inode.o \
         vfs_addr.o \
         vfs_file.o \
         vfs_dir.o \
         vfs_dentry.o \
-        error.o \
         v9fs.o \
         fid.o \
-        fcprint.o