From 3ea9cf81e5965d3f8e2060bc16e83ca693d83663 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 24 Sep 2008 16:22:23 -0500
Subject: [PATCH] --- yaml --- r: 110011 b: refs/heads/master c:
 ec3c68f232f6d98b4596c05c1c7551b44c617c5f h: refs/heads/master i:   110009:
 2e4d3da890c17d614aa586236d9341850627a3ed   110007:
 0d33948a572791f30af822ba13081f4d50f15cd2 v: v3

---
 [refs]                  |  2 +-
 trunk/net/9p/trans_fd.c | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 42731306b64d..ba866e3a066f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 571ffeafffbfdd0b8f2f9d3b991028797ec87e42
+refs/heads/master: ec3c68f232f6d98b4596c05c1c7551b44c617c5f
diff --git a/trunk/net/9p/trans_fd.c b/trunk/net/9p/trans_fd.c
index 6c88e8983750..f6d4af16cb19 100644
--- a/trunk/net/9p/trans_fd.c
+++ b/trunk/net/9p/trans_fd.c
@@ -1344,7 +1344,6 @@ p9_fd_poll(struct p9_trans *trans, struct poll_table_struct *pt)
 {
 	int ret, n;
 	struct p9_trans_fd *ts = NULL;
-	mm_segment_t oldfs;
 
 	if (trans && trans->status == Connected)
 		ts = trans->priv;
@@ -1358,24 +1357,17 @@ p9_fd_poll(struct p9_trans *trans, struct poll_table_struct *pt)
 	if (!ts->wr->f_op || !ts->wr->f_op->poll)
 		return -EIO;
 
-	oldfs = get_fs();
-	set_fs(get_ds());
-
 	ret = ts->rd->f_op->poll(ts->rd, pt);
 	if (ret < 0)
-		goto end;
+		return ret;
 
 	if (ts->rd != ts->wr) {
 		n = ts->wr->f_op->poll(ts->wr, pt);
-		if (n < 0) {
-			ret = n;
-			goto end;
-		}
+		if (n < 0)
+			return n;
 		ret = (ret & ~POLLOUT) | (n & ~POLLIN);
 	}
 
-end:
-	set_fs(oldfs);
 	return ret;
 }