summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2010-10-28 08:17:54 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-10-28 11:14:05 -0400
commit568a810d7edd58bd505222dd1c7e48895532290b (patch)
treeb1ff2247dca234060e4a966e5f5ab969493a43e1 /fs
parent81280572ca6f54009edfa4deee563e8678784218 (diff)
downloadop-kernel-dev-568a810d7edd58bd505222dd1c7e48895532290b.zip
op-kernel-dev-568a810d7edd58bd505222dd1c7e48895532290b.tar.gz
Fixed Regression in NFS Direct I/O path
A typo, introduced by commit f11ac8db, in the nfs_direct_write() routine causes writes with O_DIRECT set to fail with a ENOMEM error. Found-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve Dickson <steved@redhat.com> Cc: stable@kernel.org Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/direct.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 064a809..84d3c8b 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -873,7 +873,7 @@ static ssize_t nfs_direct_write(struct kiocb *iocb, const struct iovec *iov,
dreq->inode = inode;
dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp));
dreq->l_ctx = nfs_get_lock_context(dreq->ctx);
- if (dreq->l_ctx != NULL)
+ if (dreq->l_ctx == NULL)
goto out_release;
if (!is_sync_kiocb(iocb))
dreq->iocb = iocb;
OpenPOWER on IntegriCloud