p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pnfs/blocklayout: plug block queues 

Make sure the block queue is plugged when performing pNFS blocklayout I/O.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Christoph Hellwig 2014-08-21 11:09:28 -05:00 committed by Trond Myklebust
parent 72c5e59f63
commit be98fd0ac3
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/nfs/blocklayout/blocklayout.c
View File

@ -255,6 +255,7 @@ bl_read_pagelist(struct nfs_pgio_header *hdr)
struct page **pages = hdr->args.pages; struct page **pages = hdr->args.pages;
int pg_index = hdr->args.pgbase >> PAGE_CACHE_SHIFT; int pg_index = hdr->args.pgbase >> PAGE_CACHE_SHIFT;
const bool is_dio = (header->dreq != NULL); const bool is_dio = (header->dreq != NULL);
struct blk_plug plug;
dprintk("%s enter nr_pages %u offset %lld count %u\n", __func__, dprintk("%s enter nr_pages %u offset %lld count %u\n", __func__,
hdr->page_array.npages, f_offset, hdr->page_array.npages, f_offset,
@ -266,6 +267,8 @@ bl_read_pagelist(struct nfs_pgio_header *hdr)
par->pnfs_callback = bl_end_par_io_read; par->pnfs_callback = bl_end_par_io_read;
/* At this point, we can no longer jump to use_mds */ /* At this point, we can no longer jump to use_mds */
blk_start_plug(&plug);
isect = (sector_t) (f_offset >> SECTOR_SHIFT); isect = (sector_t) (f_offset >> SECTOR_SHIFT);
/* Code assumes extents are page-aligned */ /* Code assumes extents are page-aligned */
for (i = pg_index; i < hdr->page_array.npages; i++) { for (i = pg_index; i < hdr->page_array.npages; i++) {
@ -342,6 +345,7 @@ bl_read_pagelist(struct nfs_pgio_header *hdr)
bl_put_extent(be); bl_put_extent(be);
bl_put_extent(cow_read); bl_put_extent(cow_read);
bl_submit_bio(READ, bio); bl_submit_bio(READ, bio);
blk_finish_plug(&plug);
put_parallel(par); put_parallel(par);
return PNFS_ATTEMPTED; return PNFS_ATTEMPTED;
@ -688,9 +692,12 @@ bl_write_pagelist(struct nfs_pgio_header *header, int sync)
u64 temp; u64 temp;
int npg_per_block = int npg_per_block =
NFS_SERVER(header->inode)->pnfs_blksize >> PAGE_CACHE_SHIFT; NFS_SERVER(header->inode)->pnfs_blksize >> PAGE_CACHE_SHIFT;
struct blk_plug plug;
dprintk("%s enter, %Zu@%lld\n", __func__, count, offset); dprintk("%s enter, %Zu@%lld\n", __func__, count, offset);
blk_start_plug(&plug);
if (header->dreq != NULL && if (header->dreq != NULL &&
(!IS_ALIGNED(offset, NFS_SERVER(header->inode)->pnfs_blksize) || (!IS_ALIGNED(offset, NFS_SERVER(header->inode)->pnfs_blksize) ||
!IS_ALIGNED(count, NFS_SERVER(header->inode)->pnfs_blksize))) { !IS_ALIGNED(count, NFS_SERVER(header->inode)->pnfs_blksize))) {
@ -894,9 +901,11 @@ bl_write_pagelist(struct nfs_pgio_header *header, int sync)
bl_put_extent(be); bl_put_extent(be);
bl_put_extent(cow_read); bl_put_extent(cow_read);
bl_submit_bio(WRITE, bio); bl_submit_bio(WRITE, bio);
blk_finish_plug(&plug);
put_parallel(par); put_parallel(par);
return PNFS_ATTEMPTED; return PNFS_ATTEMPTED;
out_mds: out_mds:
blk_finish_plug(&plug);
bl_put_extent(be); bl_put_extent(be);
bl_put_extent(cow_read); bl_put_extent(cow_read);
kfree(par); kfree(par);