Error in fs/dquot.c 2.1.56

Graffiti (ramune@datadepot.com)
Sat, 20 Sep 1997 10:42:58 -0700 (PDT)


Hi all!

Got an error compiling 2.1.56. There seems to be one extra argument to llseek in fs/dquot.c.
What was the intention of putting that filp->f_dentry->d_inode in the argument list for llseek?

gcc -D__KERNEL__ -I/var/src/linux-2.1.56/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -DCPU=686 -c -o fs/dquot.o fs/dquot.c
fs/dquot.c: In function `write_dquot':
fs/dquot.c:233: warning: passing arg 1 from incompatible pointer type
fs/dquot.c:233: warning: passing arg 2 makes integer from pointer without a cast
fs/dquot.c:233: too many arguments to function
fs/dquot.c: In function `read_dquot':
fs/dquot.c:265: warning: passing arg 1 from incompatible pointer type
fs/dquot.c:265: warning: passing arg 2 makes integer from pointer without a cast
fs/dquot.c:265: too many arguments to function
make: *** [fs/dquot.o] Error 1

from /usr/src/linux/fs/dquot.c:

232: if (filp->f_op->llseek(filp->f_dentry->d_inode, filp,
233: dqoff(dquot->dq_id), 0) != dqoff(dquot->dq_id)) {
234: up(&dquot->dq_mnt->mnt_sem);
235: unlock_dquot(dquot);
236: return;

264: if (filp->f_op->llseek(filp->f_dentry->d_inode, filp,
265: dqoff(dquot->dq_id), 0) != dqoff(dquot->dq_id)) {
266: up(&dquot->dq_mnt->mnt_sem);
267: unlock_dquot(dquot);
268: return;

from /usr/src/linux/fs/read_write.c:

45: static inline long long llseek(struct file *file, long long offset, unsigned int origin)
46: {
47: long long (*fn)(struct file *, long long, int);
48:
49: fn = default_llseek;
50: if (file->f_op && file->f_op->llseek)
51: fn = file->f_op->llseek;
52: return fn(file, offset, origin);
53: }

It compiles cleanly w/o quotas, though.

-- DAN