Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 653a7746 authored by Al Viro's avatar Al Viro
Browse files

Merge remote-tracking branch 'ovl/for-viro' into for-linus 

Overlayfs-related series from Miklos and Amir
parents f6c99aad 0eb8af49

drivers/block/loop.c

+2 −2
Original line number Diff line number Diff line
@@ -501,9 +501,9 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, 
	cmd->iocb.ki_flags = IOCB_DIRECT;



	if (rw == WRITE)

		ret = file->f_op->write_iter(&cmd->iocb, &iter);

		ret = call_write_iter(file, &cmd->iocb, &iter);

	else

		ret = file->f_op->read_iter(&cmd->iocb, &iter);

		ret = call_read_iter(file, &cmd->iocb, &iter);



	if (ret != -EIOCBQUEUED)

		cmd->iocb.ki_complete(&cmd->iocb, ret, 0);

drivers/gpu/drm/i915/i915_gem_dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct * 
	if (!obj->base.filp)

		return -ENODEV;



	ret = obj->base.filp->f_op->mmap(obj->base.filp, vma);

	ret = call_mmap(obj->base.filp, vma);

	if (ret)

		return ret;

drivers/gpu/drm/vgem/vgem_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int vgem_prime_mmap(struct drm_gem_object *obj, 
	if (!obj->filp)

		return -ENODEV;



	ret = obj->filp->f_op->mmap(obj->filp, vma);

	ret = call_mmap(obj->filp, vma);

	if (ret)

		return ret;

fs/aio.c

+2 −2
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ static ssize_t aio_read(struct kiocb *req, struct iocb *iocb, bool vectored, 
		return ret;

	ret = rw_verify_area(READ, file, &req->ki_pos, iov_iter_count(&iter));

	if (!ret)

		ret = aio_ret(req, file->f_op->read_iter(req, &iter));

		ret = aio_ret(req, call_read_iter(file, req, &iter));

	kfree(iovec);

	return ret;

}
@@ -1520,7 +1520,7 @@ static ssize_t aio_write(struct kiocb *req, struct iocb *iocb, bool vectored, 
	if (!ret) {

		req->ki_flags |= IOCB_WRITE;

		file_start_write(file);

		ret = aio_ret(req, file->f_op->write_iter(req, &iter));

		ret = aio_ret(req, call_write_iter(file, req, &iter));

		/*

		 * We release freeze protection in aio_complete().  Fool lockdep

		 * by telling it the lock got released so that it doesn't

fs/coda/file.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma) 
	cfi->cfi_mapcount++;

	spin_unlock(&cii->c_lock);



	return host_file->f_op->mmap(host_file, vma);

	return call_mmap(host_file, vma);

}



int coda_open(struct inode *coda_inode, struct file *coda_file)