Skip to content

Commit

Permalink
btrfs: nowait aio: Correct assignment of pos
Browse files Browse the repository at this point in the history
Assigning pos for usage early messes up in append mode, where the pos is
re-assigned in generic_write_checks(). Assign pos later to get the
correct position to write from iocb->ki_pos.

Since check_can_nocow also uses the value of pos, we shift
generic_write_checks() before check_can_nocow(). Checks with IOCB_DIRECT
are present in generic_write_checks(), so checking for IOCB_NOWAIT is
enough.

Also, put locking sequence in the fast path.

This fixes a user visible bug, as reported:

"apparently breaks several shell related features on my system.
In zsh history stopped working, because no new entries are added
anymore.
I fist noticed the issue when I tried to build mplayer. It uses a shell
script to generate a help_mp.h file:
[...]

Here is a simple testcase:

 % echo "foo" >> test
 % echo "foo" >> test
 % cat test
 foo
 %
"

Fixes: edf064e ("btrfs: nowait aio support")
CC: Jens Axboe <[email protected]>
Reported-by: Markus Trippelsdorf <[email protected]>
Link: https://lkml.kernel.org/r/20170704042306.GA274@x4
Signed-off-by: Goldwyn Rodrigues <[email protected]>
Reviewed-by: David Sterba <[email protected]>
Signed-off-by: David Sterba <[email protected]>
  • Loading branch information
goldwynr authored and kdave committed Jul 10, 2017
1 parent f95a0d6 commit ff0fa73
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions fs/btrfs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1875,16 +1875,25 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
ssize_t num_written = 0;
bool sync = (file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host);
ssize_t err;
loff_t pos = iocb->ki_pos;
loff_t pos;
size_t count = iov_iter_count(from);
loff_t oldsize;
int clean_page = 0;

if ((iocb->ki_flags & IOCB_NOWAIT) &&
(iocb->ki_flags & IOCB_DIRECT)) {
/* Don't sleep on inode rwsem */
if (!inode_trylock(inode))
if (!inode_trylock(inode)) {
if (iocb->ki_flags & IOCB_NOWAIT)
return -EAGAIN;
inode_lock(inode);
}

err = generic_write_checks(iocb, from);
if (err <= 0) {
inode_unlock(inode);
return err;
}

pos = iocb->ki_pos;
if (iocb->ki_flags & IOCB_NOWAIT) {
/*
* We will allocate space in case nodatacow is not set,
* so bail
Expand All @@ -1895,13 +1904,6 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
inode_unlock(inode);
return -EAGAIN;
}
} else
inode_lock(inode);

err = generic_write_checks(iocb, from);
if (err <= 0) {
inode_unlock(inode);
return err;
}

current->backing_dev_info = inode_to_bdi(inode);
Expand Down

0 comments on commit ff0fa73

Please sign in to comment.