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

Commit b0f259e9 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-2.6.38/core' into for-next

parents 10c93760 3603b8ea

drivers/block/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ lo_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf, 
	struct loop_device *lo = p->lo;

	struct page *page = buf->page;

	sector_t IV;

	int size, ret;

	int size;



	IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9)) +

							(buf->offset >> 9);

fs/nfsd/vfs.c

+0 −1
Original line number Diff line number Diff line
@@ -845,7 +845,6 @@ nfsd_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf, 
	struct page **pp = rqstp->rq_respages + rqstp->rq_resused;

	struct page *page = buf->page;

	size_t size;

	int ret;



	size = sd->len;