Skip to contentSkip to conversation

v9fs: consolidate trans_sock into trans_fd

PATCH In review Eric Van Hensbergen 3 participants 3 messages Mar 3, 2006 – Mar 4, 2006 9P file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 v9fs: consolidate trans_sock into trans_fd

Subject: [PATCH] v9fs: consolidate trans_sock into trans_fd

From: Russ Cox <[email protected]>

here is a new trans_fd.c that replaces the current trans_fd.c and trans_sock.c. i haven't tested it but the changes are pretty trivial.

---

 fs/9p/Makefile     |    1 
 fs/9p/trans_fd.c   |  295 ++++++++++++++++++++++++++++++----------------
 fs/9p/trans_sock.c |  334 ----------------------------------------------------
 3 files changed, 195 insertions(+), 435 deletions(-)
 delete mode 100644 fs/9p/trans_sock.c

030b86bd48d0575a0f52ca558b3fabe66882c80a

fs/9p/Makefile +0 -1
index 2f4ce43..5db5af9 100644
@@ -2,7 +2,6 @@ obj-$(CONFIG_9P_FS) := 9p2000.o
 
 9p2000-objs := \
 	trans_fd.o \
-	trans_sock.o \
 	mux.o \
 	9p.o \
 	conv.o \
fs/9p/trans_fd.c +195 -100

383 lines not on this page · raw message

fs/9p/trans_sock.c deleted +0 -334

334 lines not on this page · raw message

Signature · 1 line
1.0.GIT
#1 lore raw
Quoted 4 lines · Eric Van Hensbergen

here is a new trans_fd.c that replaces the current trans_fd.c and trans_sock.c. i haven't tested it but the changes are pretty trivial.

I trust that second sentence is obsolete?

#2 lore raw
Quoted 8 lines · Andrew Morton
Quoted 4 lines · Eric Van Hensbergen

here is a new trans_fd.c that replaces the current trans_fd.c and trans_sock.c. i haven't tested it but the changes are pretty trivial.

I trust that second sentence is obsolete?

Yeah sorry -- I just cut and pasted Russ' original comments. It has passed all of our regressions.

-eric