summaryrefslogtreecommitdiffstats
path: root/fs/coda
diff options
context:
space:
mode:
authorJan Harkes <jaharkes@cs.cmu.edu>2010-09-17 23:26:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-19 11:03:09 -0700
commit112d421df2fddc0278584b084f4fcfedd144c5f4 (patch)
tree29ae7aef63427f4163f25222e4712b08a80703c7 /fs/coda
parent151b6a5f1d4c547c92ec67a5a6fedc16f435956e (diff)
downloadop-kernel-dev-112d421df2fddc0278584b084f4fcfedd144c5f4.zip
op-kernel-dev-112d421df2fddc0278584b084f4fcfedd144c5f4.tar.gz
Coda: mount hangs because of missed REQ_WRITE rename
Coda's REQ_* defines were renamed to avoid clashes with the block layer (commit 4aeefdc69f7b: "coda: fixup clash with block layer REQ_* defines"). However one was missed and response messages are no longer matched with requests and waiting threads are no longer woken up. This patch fixes this. Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> [ Also fixed up whitespace while at it -Linus ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/coda')
-rw-r--r--fs/coda/psdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index de89645..116af75 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -184,8 +184,8 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
}
/* adjust outsize. is this useful ?? */
- req->uc_outSize = nbytes;
- req->uc_flags |= REQ_WRITE;
+ req->uc_outSize = nbytes;
+ req->uc_flags |= CODA_REQ_WRITE;
count = nbytes;
/* Convert filedescriptor into a file handle */
OpenPOWER on IntegriCloud