diff options
author | Eric Van Hensbergen <ericvh@opteron.9grid.us> | 2008-05-08 20:26:37 -0500 |
---|---|---|
committer | Eric Van Hensbergen <ericvh@opteron.9grid.us> | 2008-05-14 19:23:27 -0500 |
commit | 887b3ece65be7b643dfdae0d433c91a26a3f437d (patch) | |
tree | 471889dcdd3f7eb6762d863fef236014c63a0301 /net/9p/Makefile | |
parent | 332c421e67045343de74e644cdf389f559f0d83f (diff) | |
download | blackbird-op-linux-887b3ece65be7b643dfdae0d433c91a26a3f437d.tar.gz blackbird-op-linux-887b3ece65be7b643dfdae0d433c91a26a3f437d.zip |
9p: fix error path during early mount
There was some cleanup issues during early mount which would trigger
a kernel bug for certain types of failure. This patch reorganizes the
cleanup to get rid of the bad behavior.
This also merges the 9pnet and 9pnet_fd modules for the purpose of
configuration and initialization. Keeping the fd transport separate
from the core 9pnet code seemed like a good idea at the time, but in
practice has caused more harm and confusion than good.
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'net/9p/Makefile')
-rw-r--r-- | net/9p/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/9p/Makefile b/net/9p/Makefile index 8a1051101898..519219480db1 100644 --- a/net/9p/Makefile +++ b/net/9p/Makefile @@ -1,5 +1,4 @@ obj-$(CONFIG_NET_9P) := 9pnet.o -obj-$(CONFIG_NET_9P_FD) += 9pnet_fd.o obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o 9pnet-objs := \ @@ -9,8 +8,6 @@ obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o error.o \ fcprint.o \ util.o \ - -9pnet_fd-objs := \ trans_fd.o \ 9pnet_virtio-objs := \ |