diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 09:39:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 09:39:48 +1000 |
| commit | fbcb7e2b937e64d2acc3f263abbd592428490617 (patch) | |
| tree | 91fbec5165d1ac2c7158ff23967aa492a5862654 /drivers | |
| parent | e479a8555818e5f99cdc3928dc370785ae50cf07 (diff) | |
| parent | 6717b841aa9e0daa99c72d111c17a8ddcaca51f7 (diff) | |
Merge commit 'ext3/for_next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/raw.c | 2 | ||||
| -rw-r--r-- | drivers/staging/pohmelfs/inode.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/raw.c b/drivers/char/raw.c index 05f9d18b9361..40268db02e22 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c @@ -246,7 +246,7 @@ static const struct file_operations raw_fops = { .read = do_sync_read, .aio_read = generic_file_aio_read, .write = do_sync_write, - .aio_write = generic_file_aio_write_nolock, + .aio_write = blkdev_aio_write, .open = raw_open, .release= raw_release, .ioctl = raw_ioctl, diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c index 7b605795b770..a2e5eedbbc56 100644 --- a/drivers/staging/pohmelfs/inode.c +++ b/drivers/staging/pohmelfs/inode.c @@ -921,16 +921,16 @@ ssize_t pohmelfs_write(struct file *file, const char __user *buf, if (ret) goto err_out_unlock; - ret = generic_file_aio_write_nolock(&kiocb, &iov, 1, pos); + ret = __generic_file_aio_write(&kiocb, &iov, 1, &kiocb.ki_pos); *ppos = kiocb.ki_pos; mutex_unlock(&inode->i_mutex); WARN_ON(ret < 0); - if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) { + if (ret > 0) { ssize_t err; - err = sync_page_range(inode, mapping, pos, ret); + err = generic_write_sync(file, pos, ret); if (err < 0) ret = err; WARN_ON(ret < 0); |