diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /fs/dquot.c | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'fs/dquot.c')
| -rw-r--r-- | fs/dquot.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/fs/dquot.c b/fs/dquot.c index 3b59ef828..cf2b91c0a 100644 --- a/fs/dquot.c +++ b/fs/dquot.c @@ -223,25 +223,17 @@ static void write_dquot(struct dquot *dquot) short type = dquot->dq_type; struct file *filp = dquot->dq_mnt->mnt_quotas[type]; unsigned long fs; + loff_t offset; if (!(dquot->dq_flags & DQ_MOD) || (filp == (struct file *)NULL)) return; lock_dquot(dquot); down(&dquot->dq_mnt->mnt_sem); - if (filp->f_op->llseek) { - if (filp->f_op->llseek(filp->f_dentry->d_inode, filp, - dqoff(dquot->dq_id), 0) != dqoff(dquot->dq_id)) { - up(&dquot->dq_mnt->mnt_sem); - unlock_dquot(dquot); - return; - } - } else - filp->f_pos = dqoff(dquot->dq_id); + offset = dqoff(dquot->dq_id); fs = get_fs(); set_fs(KERNEL_DS); - if (filp->f_op->write(filp->f_dentry->d_inode, filp, - (char *)&dquot->dq_dqb, sizeof(struct dqblk)) == sizeof(struct dqblk)) + if (filp->f_op->write(filp, (char *)&dquot->dq_dqb, sizeof(struct dqblk), &offset) == sizeof(struct dqblk)) dquot->dq_flags &= ~DQ_MOD; up(&dquot->dq_mnt->mnt_sem); @@ -255,23 +247,16 @@ static void read_dquot(struct dquot *dquot) short type = dquot->dq_type; struct file *filp = dquot->dq_mnt->mnt_quotas[type]; unsigned long fs; + loff_t offset; if (filp == (struct file *)NULL) return; lock_dquot(dquot); down(&dquot->dq_mnt->mnt_sem); - if (filp->f_op->llseek) { - if (filp->f_op->llseek(filp->f_dentry->d_inode, filp, - dqoff(dquot->dq_id), 0) != dqoff(dquot->dq_id)) { - up(&dquot->dq_mnt->mnt_sem); - unlock_dquot(dquot); - return; - } - } else - filp->f_pos = dqoff(dquot->dq_id); + offset = dqoff(dquot->dq_id); fs = get_fs(); set_fs(KERNEL_DS); - filp->f_op->read(filp->f_dentry->d_inode, filp, (char *)&dquot->dq_dqb, sizeof(struct dqblk)); + filp->f_op->read(filp, (char *)&dquot->dq_dqb, sizeof(struct dqblk), &offset); up(&dquot->dq_mnt->mnt_sem); set_fs(fs); if (dquot->dq_bhardlimit == 0 && dquot->dq_bsoftlimit == 0 && |