[PATCH 01/24] Revert "pnfs-nonfilelayout: Prelim support for non-file layout O_DIRECT"

Fred Isaman
2010-06-08T04:19:45Z

This reverts commit 05277f5f5236462a11e7a20ebe9009449f8a463d.

Signed-off-by: Fred Isaman <iisaman@netapp.com>
---
fs/nfs/direct.c | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index e111e9f..02e5918 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -191,22 +191,12 @@ static ssize_t nfs_direct_wait(struct nfs_direct_req *dreq)
{
ssize_t result = -EIOCBQUEUED;

- if (!pnfs_use_rpc(NFS_SERVER(dreq->inode))) {
- /* FIXME: Right now non-rpc layout types must perform
- * syncronous direct i/o.
- * New pNFS callback to wait on outstanding requests?
- */
- result = 0;
- goto set_result;
- }
-
/* Async requests don't wait here */
if (dreq->iocb)
goto out;

result = wait_for_completion_killable(&dreq->completion);

-set_result:
if (!result)
result = dreq->error;
if (!result)
--
1.6.6.1