All pastes #344229 Raw Edit

Someone

public text v1 · immutable
·published 2007-02-07 16:56 UTC
rendered paste body
2845,2846c2845,2846
< static ssize_t snd_pcm_aio_read(struct kiocb *iocb, const struct iovec *iov,
<                              unsigned long nr_segs, loff_t pos)
---
> static ssize_t snd_pcm_readv(struct file *file, const struct iovec *_vector,
>                            unsigned long count, loff_t * offset)
2857c2857
<       pcm_file = iocb->ki_filp->private_data;
---
>       pcm_file = file->private_data;
2863c2863
<       if (nr_segs > 1024 || nr_segs != runtime->channels)
---
>       if (count > 1024 || count != runtime->channels)
2865c2865
<       if (!frame_aligned(runtime, iov->iov_len))
---
>       if (!frame_aligned(runtime, _vector->iov_len))
2867,2868c2867,2868
<       frames = bytes_to_samples(runtime, iov->iov_len);
<       bufs = kmalloc(sizeof(void *) * nr_segs, GFP_KERNEL);
---
>       frames = bytes_to_samples(runtime, _vector->iov_len);
>       bufs = kmalloc(sizeof(void *) * count, GFP_KERNEL);
2871,2872c2871,2872
<       for (i = 0; i < nr_segs; ++i)
<               bufs[i] = iov[i].iov_base;
---
>       for (i = 0; i < count; ++i)
>               bufs[i] = _vector[i].iov_base;
2880,2881c2880,2881
< static ssize_t snd_pcm_aio_write(struct kiocb *iocb, const struct iovec *iov,
<                               unsigned long nr_segs, loff_t pos)
---
> static ssize_t snd_pcm_writev(struct file *file, const struct iovec *_vector,
>                             unsigned long count, loff_t * offset)
2894c2894
<       pcm_file = iocb->ki_filp->private_data;
---
>       pcm_file = file->private_data;
2902,2903c2902,2903
<       if (nr_segs > 128 || nr_segs != runtime->channels ||
<           !frame_aligned(runtime, iov->iov_len)) {
---
>       if (count > 128 || count != runtime->channels ||
>           !frame_aligned(runtime, _vector->iov_len)) {
2907,2908c2907,2908
<       frames = bytes_to_samples(runtime, iov->iov_len);
<       bufs = kmalloc(sizeof(void *) * nr_segs, GFP_KERNEL);
---
>       frames = bytes_to_samples(runtime, _vector->iov_len);
>       bufs = kmalloc(sizeof(void *) * count, GFP_KERNEL);
2911,2912c2911,2912
<       for (i = 0; i < nr_segs; ++i)
<               bufs[i] = iov[i].iov_base;
---
>       for (i = 0; i < count; ++i)
>               bufs[i] = _vector[i].iov_base;
3569c3569
<               .aio_write =            snd_pcm_aio_write,
---
>               .writev =               snd_pcm_writev,
3589c3589
<               .aio_read =             snd_pcm_aio_read,
---
>               .readv =                snd_pcm_readv,