diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-03-07 09:16:24 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-03-07 09:16:24 +0100 |
commit | 59117306e0d0e152acb72e89cc22f060a3c6a50a (patch) | |
tree | a22a93b11fdcb827d820c2a415eb0587bf18fed0 /fs/btrfs/reflink.c | |
parent | ALSA: hda - bind headset buttons to the headphone jack (diff) | |
parent | ALSA: virtio: introduce device suspend/resume support (diff) | |
download | linux-59117306e0d0e152acb72e89cc22f060a3c6a50a.tar.xz linux-59117306e0d0e152acb72e89cc22f060a3c6a50a.zip |
Merge tag 'tags/virtio_snd-5.12-rc2' into for-next
ALSA: add virtio sound driver
This series implements a driver part of the virtio sound device
specification v8 [1].
The driver supports PCM playback and capture substreams, jack and
channel map controls. A message-based transport is used to write/read
PCM frames to/from a device.
As a device part was used OpenSynergy proprietary implementation.
v7 changes:
- Moved the snd_pcm_period_elapsed() call from the interrupt handler to the
kernel worker for being consistent with the non-atomic mode of the PCM
device.
- Removed SNDRV_PCM_INFO_RESUME flag. Now ops->prepare() sets the parameters
for the substream if it was previously suspended.
- Some additional code readability improvements/comments.
[1] https://lists.oasis-open.org/archives/virtio-dev/202003/msg00185.html
Link: https://lore.kernel.org/r/20210302164709.3142702-1-anton.yakovlev@opensynergy.com
Diffstat (limited to 'fs/btrfs/reflink.c')
-rw-r--r-- | fs/btrfs/reflink.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c index b24396cf2f99..762881b777b3 100644 --- a/fs/btrfs/reflink.c +++ b/fs/btrfs/reflink.c @@ -106,12 +106,8 @@ static int copy_inline_to_page(struct btrfs_inode *inode, set_bit(BTRFS_INODE_NO_DELALLOC_FLUSH, &inode->runtime_flags); if (comp_type == BTRFS_COMPRESS_NONE) { - char *map; - - map = kmap(page); - memcpy(map, data_start, datal); + memcpy_to_page(page, 0, data_start, datal); flush_dcache_page(page); - kunmap(page); } else { ret = btrfs_decompress(comp_type, data_start, page, 0, inline_size, datal); @@ -553,6 +549,24 @@ process_slot: */ btrfs_release_path(path); + /* + * When using NO_HOLES and we are cloning a range that covers + * only a hole (no extents) into a range beyond the current + * i_size, punching a hole in the target range will not create + * an extent map defining a hole, because the range starts at or + * beyond current i_size. If the file previously had an i_size + * greater than the new i_size set by this clone operation, we + * need to make sure the next fsync is a full fsync, so that it + * detects and logs a hole covering a range from the current + * i_size to the new i_size. If the clone range covers extents, + * besides a hole, then we know the full sync flag was already + * set by previous calls to btrfs_replace_file_extents() that + * replaced file extent items. + */ + if (last_dest_end >= i_size_read(inode)) + set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, + &BTRFS_I(inode)->runtime_flags); + ret = btrfs_replace_file_extents(inode, path, last_dest_end, destoff + len - 1, NULL, &trans); if (ret) |