git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
coda
/
upcall.c
diff --git
a/fs/coda/upcall.c
b/fs/coda/upcall.c
index
1bae996
..
a5b5e63
100644
(file)
--- a/
fs/coda/upcall.c
+++ b/
fs/coda/upcall.c
@@
-611,7
+611,7
@@
int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
return error;
}
return error;
}
-int venus_statfs(struct
super_block *sb, struct kstatfs *sfs)
+int venus_statfs(struct
dentry *dentry, struct kstatfs *sfs)
{
union inputArgs *inp;
union outputArgs *outp;
{
union inputArgs *inp;
union outputArgs *outp;
@@
-620,7
+620,7
@@
int venus_statfs(struct super_block *sb, struct kstatfs *sfs)
insize = max_t(unsigned int, INSIZE(statfs), OUTSIZE(statfs));
UPARG(CODA_STATFS);
insize = max_t(unsigned int, INSIZE(statfs), OUTSIZE(statfs));
UPARG(CODA_STATFS);
- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
+ error = coda_upcall(coda_sbp(
dentry->d_
sb), insize, &outsize, inp);
if (!error) {
sfs->f_blocks = outp->coda_statfs.stat.f_blocks;
if (!error) {
sfs->f_blocks = outp->coda_statfs.stat.f_blocks;
@@
-725,7
+725,7
@@
static int coda_upcall(struct coda_sb_info *sbi,
((union inputArgs *)buffer)->ih.unique = req->uc_unique;
/* Append msg to pending queue and poke Venus. */
((union inputArgs *)buffer)->ih.unique = req->uc_unique;
/* Append msg to pending queue and poke Venus. */
- list_add
(&(req->uc_chain), vcommp->vc_pending.prev
);
+ list_add
_tail(&(req->uc_chain), &vcommp->vc_pending
);
wake_up_interruptible(&vcommp->vc_waitq);
/* We can be interrupted while we wait for Venus to process
wake_up_interruptible(&vcommp->vc_waitq);
/* We can be interrupted while we wait for Venus to process