diff options
| author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-06-26 23:20:36 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-06-26 23:20:36 +0200 |
| commit | 7ca6448dbfb398bba36eda3c01bc14b86c3675be (patch) | |
| tree | 82d934ebf07f22a2c64c3b6d82ec24082878b43a /fs/nfs/direct.c | |
| parent | f1f67a9874f1a4bba1adff6d694aa52e5f52ff1a (diff) | |
| parent | 7d681b23d6cc14a8c026ea6756242cb522cbbcae (diff) | |
| download | kernel_samsung_smdk4412-7ca6448dbfb398bba36eda3c01bc14b86c3675be.zip kernel_samsung_smdk4412-7ca6448dbfb398bba36eda3c01bc14b86c3675be.tar.gz kernel_samsung_smdk4412-7ca6448dbfb398bba36eda3c01bc14b86c3675be.tar.bz2 | |
Merge with rsync://fileserver/linux
Update to Linus latest
Diffstat (limited to 'fs/nfs/direct.c')
| -rw-r--r-- | fs/nfs/direct.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 68df803..6537f2c 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -517,7 +517,7 @@ retry: result = tot_bytes; out: - nfs_end_data_update_defer(inode); + nfs_end_data_update(inode); nfs_writedata_free(wdata); return result; @@ -751,11 +751,6 @@ nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count, retval = -EFAULT; if (!access_ok(VERIFY_READ, iov.iov_base, iov.iov_len)) goto out; - if (file->f_error) { - retval = file->f_error; - file->f_error = 0; - goto out; - } retval = -EFBIG; if (limit != RLIM_INFINITY) { if (pos >= limit) { |