diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-07 14:29:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-07 14:29:23 +1100 |
| commit | 30c4fbf7e3977ec8c2966a633cd281b44e3a63fd (patch) | |
| tree | b8d7dc9ac82e3f179d886311a6b73c9c5c52c35d /fs/btrfs/file.c | |
| parent | 725a7c316ea0d1329b630e31f82d0a2e762e0a65 (diff) | |
| parent | df2363d9ad7ffd43b5e86604c7a28f4adc6bd75e (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index af1d0605a5c1..b400e5dd1d92 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -24,6 +24,7 @@ #include <linux/string.h> #include <linux/backing-dev.h> #include <linux/mpage.h> +#include <linux/aio.h> #include <linux/falloc.h> #include <linux/swap.h> #include <linux/writeback.h> @@ -1513,7 +1514,8 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb, size_t count, ocount; bool sync = (file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host); - sb_start_write(inode->i_sb); + if (!sb_start_file_write(file)) + return -EAGAIN; mutex_lock(&inode->i_mutex); |