block layout patches
Subsystems (2)
You can pull the current block layout patches from the for-trond branch of:git://citi.umich.edu/projects/linux-pnfs-blk.git
This is based on Linux v3.0-rc5 but will soon be rebased on Trond's nfs-for-next.
Quoted 2 lines · Jim Rees
You can pull the current block layout patches from the for-trond branch of:
git://citi.umich.edu/projects/linux-pnfs-blk.git
Err, what about actually posting them for review first? The only thing so far has been all that squashme mess.
Christoph Hellwig wrote:
Err, what about actually posting them for review first? The only thing so far has been all that squashme mess.
Sorry for the missing context. About a month ago I sent out an 88 patch set for pNFS Bakeathon. That was a squashme mess. Later I sent a 35 patch set, and got back a number of comments. That's had a number of re-writes resulting in the current patch set, which is 28 patches.
While you're certainly welcome to review what's there now, it's mostly meant for Benny to pull into his tree to resolve any issues merging with other pNFS patches that haven't gone upstream yet.
I have a couple more changes to make before sending upstream:
1. replace the upcall mechanism
2. rebase on Trond's IO changes that are now in his nfs-for-next branch
After that I will be sending the entire patch set to the list and soliciting comments from reviewers. I would very much appreciate it if you could take the time to look them over when I do.
Quoted 5 lines · Jim Rees
Christoph Hellwig wrote:
Err, what about actually posting them for review first? The only thing so far has been all that squashme mess.
Quoted 8 lines
Sorry for the missing context. About a month ago I sent out an 88 patch set for pNFS Bakeathon. That was a squashme mess. Later I sent a 35 patch set, and got back a number of comments. That's had a number of re-writes resulting in the current patch set, which is 28 patches.
While you're certainly welcome to review what's there now, it's mostly meant for Benny to pull into his tree to resolve any issues merging with other pNFS patches that haven't gone upstream yet.
Oh, okay. for-trond sounds like an inclusion requests for the nfs tree.
Quoted 5 lines · Jim Rees
Christoph Hellwig wrote:
Err, what about actually posting them for review first? The only thing so far has been all that squashme mess.
Quoted 8 lines
Sorry for the missing context. About a month ago I sent out an 88 patch set for pNFS Bakeathon. That was a squashme mess. Later I sent a 35 patch set, and got back a number of comments. That's had a number of re-writes resulting in the current patch set, which is 28 patches.
While you're certainly welcome to review what's there now, it's mostly meant for Benny to pull into his tree to resolve any issues merging with other pNFS patches that haven't gone upstream yet.
I've pulled (rebased actually) your for-trond branch into my tree. The new tip is at pnfs-all-3.0-rc7-2011-07-14
I like how using bl_add_page_to_bio turned out.
For the record, the diff against pnfs-block.orig is down below (it does not include whitespace changes)
Benny
fs/nfs/blocklayout/blocklayout.c +333 -407
@@ -75,12 +75,8 @@ static int is_hole(struct pnfs_block_extent *be, sector_t isect)*/ static int is_writable (struct pnfs_block_extent *be,sector_t isect) { -if (be->be_state ==PNFS_BLOCK_READWRITE_DATA ) -return 1 ; -else if (be->be_state !=PNFS_BLOCK_INVALID_DATA ) -return 0 ; -else -return is_sector_initialized (be->be_inval, isect); +return (be->be_state ==PNFS_BLOCK_READWRITE_DATA || + be->be_state ==PNFS_BLOCK_INVALID_DATA ); } static int
@@ -109,7 +105,7 @@ static inline struct parallel_io *alloc_parallel(void *data) {struct parallel_io *rv; - rv =kmalloc (sizeof (*rv),GFP_KERNEL ); + rv =kmalloc (sizeof (*rv),GFP_NOFS );if (rv) { rv->data = data;kref_init (&rv->refcnt);
@@ -143,42 +139,83 @@ bl_submit_bio(int rw, struct bio *bio)get_parallel (bio->bi_private);dprintk ("%s submitting %s bio %u@%llu\n" , __func__, rw ==READ ?"read" :"write" , - bio->bi_size, (u64 )bio->bi_sector); + bio->bi_size, (unsigned long long )bio->bi_sector);submit_bio (rw, bio); }return NULL ; } -static inline void -bl_done_with_rpage (struct page *page,const int ok) +static struct bio *bl_alloc_init_bio (int npg,sector_t isect, +struct pnfs_block_extent *be, +void (*end_io)(struct bio *,int err), +struct parallel_io *par) { -if (ok) { -ClearPagePnfsErr (page); -SetPageUptodate (page); +struct bio *bio; + + bio =bio_alloc (GFP_NOIO , npg); +if (!bio) +return NULL ; + + bio->bi_sector = isect - be->be_f_offset + be->be_v_offset; + bio->bi_bdev = be->be_mdev; + bio->bi_end_io = end_io; + bio->bi_private = par; +return bio; +} + +static struct bio *bl_add_page_to_bio (struct bio *bio,int npg,int rw, +sector_t isect,struct page *page, +struct pnfs_block_extent *be, +void (*end_io)(struct bio *,int err), +struct parallel_io *par) +{ +retry: +if (!bio) { + bio =bl_alloc_init_bio (npg, isect, be, end_io, par); +if (!bio) +return ERR_PTR (-ENOMEM ); + } +if (bio_add_page (bio, page,PAGE_CACHE_SIZE ,0 ) <PAGE_CACHE_SIZE ) { + bio =bl_submit_bio (rw, bio); + goto retry; + } +return bio; +} + +static void bl_set_lo_fail (struct pnfs_layout_segment *lseg) +{ +if (lseg->pls_range.iomode ==IOMODE_RW ) { +dprintk ("%s Setting layout IOMODE_RW fail bit\n" , __func__); +set_bit (lo_fail_bit (IOMODE_RW ), &lseg->pls_layout->plh_flags); }else { -ClearPageUptodate (page); -SetPageError (page); -SetPagePnfsErr (page); +dprintk ("%s Setting layout IOMODE_READ fail bit\n" , __func__); +set_bit (lo_fail_bit (IOMODE_READ ), &lseg->pls_layout->plh_flags); } -/* Page is unlocked via rpc_release. Should really be done here. */ }/* This is basically copied from mpage_end_io_read */ static void bl_end_io_read (struct bio *bio,int err) { -void *data = bio->bi_private; +struct parallel_io *par = bio->bi_private;const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags);struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ; +struct nfs_read_data *rdata = (struct nfs_read_data *)par->data;do {struct page *page = bvec->bv_page;if (--bvec >= bio->bi_io_vec)prefetchw (&bvec->bv_page->flags); -bl_done_with_rpage (page, uptodate); +if (uptodate) +SetPageUptodate (page); }while (bvec >= bio->bi_io_vec); +if (!uptodate) { +if (!rdata->pnfs_error) + rdata->pnfs_error = -EIO ; +bl_set_lo_fail (rdata->lseg); + }bio_put (bio); -put_parallel (data); +put_parallel (par); }static void bl_read_cleanup (struct work_struct *work)
@@ -228,13 +265,7 @@ bl_read_pagelist(struct nfs_read_data *rdata)dprintk ("%s dont_like_caller failed\n" , __func__); goto use_mds; } -if ((rdata->npages ==1 ) &&PagePnfsErr (rdata->req->wb_page)) { -/* We want to fall back to mds in case of read_page -* after error on read_pages. -*/ -dprintk ("%s PG_pnfserr set\n" , __func__); - goto use_mds; - } + par =alloc_parallel (rdata);if (!par) goto use_mds;
@@ -243,21 +274,20 @@ bl_read_pagelist(struct nfs_read_data *rdata) par->pnfs_callback = bl_end_par_io_read;/* At this point, we can no longer jump to use_mds */ - isect = (sector_t) (f_offset >>9 ); + isect = (sector_t) (f_offset >>SECTOR_SHIFT );/* Code assumes extents are page-aligned */ for (i = pg_index; i < rdata->npages; i++) {if (!extent_length) {/* We've used up the previous extent */ -put_extent (be); -put_extent (cow_read); +bl_put_extent (be); +bl_put_extent (cow_read); bio =bl_submit_bio (READ , bio);/* Get the next one */ - be =find_get_extent (BLK_LSEG2EXT (rdata->lseg), + be =bl_find_get_extent (BLK_LSEG2EXT (rdata->lseg), isect, &cow_read);if (!be) { -/* Error out this page */ -bl_done_with_rpage (pages[i],0 ); -break ; + rdata->pnfs_error = -EIO ; + goto out; } extent_length = be->be_length - (isect - be->be_f_offset);
@@ -272,45 +302,33 @@ bl_read_pagelist(struct nfs_read_data *rdata) bio =bl_submit_bio (READ , bio);/* Fill hole w/ zeroes w/o accessing device */ dprintk ("%s Zeroing page for hole\n" , __func__); -zero_user (pages[i],0 , -min_t (int,PAGE_CACHE_SIZE , count)); +zero_user_segment (pages[i],0 ,PAGE_CACHE_SIZE );print_page (pages[i]); -bl_done_with_rpage (pages[i],1 ); +SetPageUptodate (pages[i]); }else {struct pnfs_block_extent *be_read; be_read = (hole && cow_read) ? cow_read : be; -for (;;) { -if (!bio) { - bio =bio_alloc (GFP_NOIO , rdata->npages - i); -if (!bio) { -/* Error out this page */ -bl_done_with_rpage (pages[i],0 ); -break ; - } - bio->bi_sector = isect - - be_read->be_f_offset + - be_read->be_v_offset; - bio->bi_bdev = be_read->be_mdev; - bio->bi_end_io = bl_end_io_read; - bio->bi_private = par; - } -if (bio_add_page (bio, pages[i],PAGE_SIZE ,0 )) -break ; - bio =bl_submit_bio (READ , bio); + bio =bl_add_page_to_bio (bio, rdata->npages - i,READ , + isect, pages[i], be_read, + bl_end_io_read, par); +if (IS_ERR (bio)) { + rdata->pnfs_error =PTR_ERR (bio); + goto out; } } - isect +=PAGE_CACHE_SIZE >>9 ; - extent_length -=PAGE_CACHE_SIZE >>9 ; + isect +=PAGE_CACHE_SECTORS ; + extent_length -=PAGE_CACHE_SECTORS ; } -if ((isect <<9 ) >= rdata->inode->i_size) { +if ((isect <<SECTOR_SHIFT ) >= rdata->inode->i_size) { rdata->res.eof =1 ; rdata->res.count = rdata->inode->i_size - f_offset; }else { - rdata->res.count = (isect <<9 ) - f_offset; + rdata->res.count = (isect <<SECTOR_SHIFT ) - f_offset; } -put_extent (be); -put_extent (cow_read); +out: +bl_put_extent (be); +bl_put_extent (cow_read);bl_submit_bio (READ , bio);put_parallel (par);return PNFS_ATTEMPTED ;
@@ -329,56 +347,60 @@ static void mark_extents_written(struct pnfs_block_layout *bl,dprintk ("%s(%llu, %u)\n" , __func__, offset, count);if (count ==0 )return ; - isect = (offset & (long )(PAGE_CACHE_MASK )) >>9 ; + isect = (offset & (long )(PAGE_CACHE_MASK )) >>SECTOR_SHIFT ; end = (offset + count +PAGE_CACHE_SIZE -1 ) & (long )(PAGE_CACHE_MASK ); - end >>=9 ; + end >>=SECTOR_SHIFT ;while (isect < end) {sector_t len; - be =find_get_extent (bl, isect,NULL ); + be =bl_find_get_extent (bl, isect,NULL );BUG_ON (!be);/* FIXME */ len =min (end, be->be_f_offset + be->be_length) - isect;if (be->be_state ==PNFS_BLOCK_INVALID_DATA )mark_for_commit (be, isect, len);/* What if fails? */ isect += len; -put_extent (be); - } -} - -/* STUB - this needs thought */ -static inline void -bl_done_with_wpage (struct page *page,const int ok) -{ -if (!ok) { -SetPageError (page); -SetPagePnfsErr (page); -/* This is an inline copy of nfs_zap_mapping */ -/* This is oh so fishy, and needs deep thought */ -if (page->mapping->nrpages !=0 ) { -struct inode *inode = page->mapping->host; -spin_lock (&inode->i_lock); -NFS_I (inode)->cache_validity |=NFS_INO_INVALID_DATA ; -spin_unlock (&inode->i_lock); - } +bl_put_extent (be); } -/* end_page_writeback called in rpc_release. Should be done here. */ } -/* This is basically copied from mpage_end_io_read */ -static void bl_end_io_write (struct bio *bio,int err) +static void bl_end_io_write_zero (struct bio *bio,int err) { -void *data = bio->bi_private; +struct parallel_io *par = bio->bi_private;const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags);struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ; +struct nfs_write_data *wdata = (struct nfs_write_data *)par->data;do {struct page *page = bvec->bv_page;if (--bvec >= bio->bi_io_vec)prefetchw (&bvec->bv_page->flags); -bl_done_with_wpage (page, uptodate); +/* This is the zeroing page we added */ +end_page_writeback (page); +page_cache_release (page); }while (bvec >= bio->bi_io_vec); +if (!uptodate) { +if (!wdata->pnfs_error) + wdata->pnfs_error = -EIO ; +bl_set_lo_fail (wdata->lseg); + }bio_put (bio); -put_parallel (data); +put_parallel (par); +} + +/* This is basically copied from mpage_end_io_read */ +static void bl_end_io_write (struct bio *bio,int err) +{ +struct parallel_io *par = bio->bi_private; +const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags); +struct nfs_write_data *wdata = (struct nfs_write_data *)par->data; + +if (!uptodate) { +if (!wdata->pnfs_error) + wdata->pnfs_error = -EIO ; +bl_set_lo_fail (wdata->lseg); + } +bio_put (bio); +put_parallel (par); }/* Function scheduled for call during bl_end_par_io_write,
@@ -391,11 +413,8 @@ static void bl_write_cleanup(struct work_struct *work)dprintk ("%s enter\n" , __func__); task = container_of(work, struct rpc_task, u.tk_work); wdata = container_of(task, struct nfs_write_data, task); -if (!wdata->task.tk_status) { +if (!wdata->pnfs_error) {/* Marks for LAYOUTCOMMIT */ -/* BUG - this should be called after each bio, not after -* all finish, unless have some way of storing success/failure -*/ mark_extents_written (BLK_LSEG2EXT (wdata->lseg), wdata->args.offset, wdata->args.count); }
@@ -403,31 +422,103 @@ static void bl_write_cleanup(struct work_struct *work) }/* Called when last of bios associated with a bl_write_pagelist call finishes */ -static void -bl_end_par_io_write (void *data) +static void bl_end_par_io_write (void *data) {struct nfs_write_data *wdata = data; -/* STUB - ignoring error handling */ wdata->task.tk_status =0 ; wdata->verf.committed =NFS_FILE_SYNC ;INIT_WORK (&wdata->task.u.tk_work, bl_write_cleanup);schedule_work (&wdata->task.u.tk_work); } +/* STUB - mark intersection of layout and page as bad, so is not +* used again. +*/ +static void mark_bad_read (void ) +{ +return ; +} + +/* +* map_block: map a requested I/0 block (isect) into an offset in the LVM +* block_device +*/ +static void +map_block (struct buffer_head *bh,sector_t isect,struct pnfs_block_extent *be) +{ +dprintk ("%s enter be=%p\n" , __func__, be); + +set_buffer_mapped (bh); + bh->b_bdev = be->be_mdev; + bh->b_blocknr = (isect - be->be_f_offset + be->be_v_offset) >> + (be->be_mdev->bd_inode->i_blkbits -SECTOR_SHIFT ); + +dprintk ("%s isect %ld, bh->b_blocknr %ld, using bsize %Zd\n" , + __func__, (long )isect, (long )bh->b_blocknr, bh->b_size); +return ; +} + +/* Given an unmapped page, zero it or read in page for COW, page is locked +* by caller. +*/ +static int +init_page_for_write (struct page *page,struct pnfs_block_extent *cow_read) +{ +struct buffer_head *bh =NULL ; +int ret =0 ; +sector_t isect; + +dprintk ("%s enter, %p\n" , __func__, page); +BUG_ON (PageUptodate (page)); +if (!cow_read) { +zero_user_segment (page,0 ,PAGE_SIZE ); +SetPageUptodate (page); + goto cleanup; + } + + bh =alloc_page_buffers (page,PAGE_CACHE_SIZE ,0 ); +if (!bh) { + ret = -ENOMEM ; + goto cleanup; + } + + isect = (sector_t ) page->index <<PAGE_CACHE_SECTOR_SHIFT ; +map_block (bh, isect, cow_read); +if (!bh_uptodate_or_lock (bh)) + ret =bh_submit_read (bh); +if (ret) + goto cleanup; +SetPageUptodate (page); + +cleanup: +bl_put_extent (cow_read); +if (bh) +free_buffer_head (bh); +if (ret) { +/* Need to mark layout with bad read...should now +* just use nfs4 for reads and writes. +*/ +mark_bad_read (); + } +return ret; +} +static enum pnfs_try_status -bl_write_pagelist (struct nfs_write_data *wdata, -int sync) +bl_write_pagelist (struct nfs_write_data *wdata,int sync) { -int i; +int i, ret, npg_zero, pg_index, last =0 ;struct bio *bio =NULL ; -struct pnfs_block_extent *be =NULL ; -sector_t isect, extent_length =0 ; +struct pnfs_block_extent *be =NULL , *cow_read =NULL ; +sector_t isect, last_isect =0 , extent_length =0 ;struct parallel_io *par;loff_t offset = wdata->args.offset;size_t count = wdata->args.count;struct page **pages = wdata->args.pages; -int pg_index = wdata->args.pgbase >>PAGE_CACHE_SHIFT ; +struct page *page; +pgoff_t index; +int npg_per_block = +NFS_SERVER (wdata->inode)->pnfs_blksize >>PAGE_CACHE_SHIFT ;dprintk ("%s enter, %Zu@%lld\n" , __func__, count, offset);if (!wdata->lseg) {
@@ -439,11 +530,8 @@ bl_write_pagelist(struct nfs_write_data *wdata,return PNFS_NOT_ATTEMPTED ; }/* At this point, wdata->pages is a (sequential) list of nfs_pages. -* We want to write each, and if there is an error remove it from -* list and call -* nfs_retry_request(req) to have it redone using nfs. -* QUEST? Do as block or per req? Think have to do per block -* as part of end_bio +* We want to write each, and if there is an error set pnfs_error +* to have it redone using nfs. */ par =alloc_parallel (wdata);if (!par)
@@ -453,49 +541,145 @@ bl_write_pagelist(struct nfs_write_data *wdata, par->pnfs_callback = bl_end_par_io_write;/* At this point, have to be more careful with error handling */ - isect = (sector_t) ((offset & (long )PAGE_CACHE_MASK ) >>9 ); + isect = (sector_t) ((offset & (long )PAGE_CACHE_MASK ) >>SECTOR_SHIFT ); + be =bl_find_get_extent (BLK_LSEG2EXT (wdata->lseg), isect, &cow_read); +if (!be || !is_writable (be, isect)) { +dprintk ("%s no matching extents!\n" , __func__); + wdata->pnfs_error = -EINVAL ; + goto out; + } + +/* First page inside INVALID extent */ +if (be->be_state ==PNFS_BLOCK_INVALID_DATA ) { + npg_zero = (offset >>PAGE_CACHE_SHIFT ) % npg_per_block; + isect = (sector_t) (((offset - npg_zero *PAGE_CACHE_SIZE ) & + (long )PAGE_CACHE_MASK ) >>SECTOR_SHIFT ); + extent_length = be->be_length - (isect - be->be_f_offset); + +fill_invalid_ext: +dprintk ("%s need to zero %d pages\n" , __func__, npg_zero); +for (;npg_zero >0 ; npg_zero--) { +/* page ref released in bl_end_io_write_zero */ + index = isect >>PAGE_CACHE_SECTOR_SHIFT ; +dprintk ("%s zero %dth page: index %lu isect %lu\n" , + __func__, npg_zero, index, isect); + page = +find_or_create_page (wdata->inode->i_mapping, index, +GFP_NOFS ); +if (!page) { +dprintk ("%s oom\n" , __func__); + wdata->pnfs_error = -ENOMEM ; + goto out; + } + +/* PageDirty: Other will write this out +* PageWriteback: Other is writing this out +* PageUptodate: It was read before +* sector_initialized: already written out +*/ +if (PageDirty (page) ||PageWriteback (page) || +is_sector_initialized (be->be_inval, isect)) { +print_page (page); +unlock_page (page); +page_cache_release (page); + goto next_page; + } +if (!PageUptodate (page)) { +/* New page, readin or zero it */ +init_page_for_write (page, cow_read); + } +set_page_writeback (page); +unlock_page (page); + + ret =bl_mark_sectors_init (be->be_inval, isect, +PAGE_CACHE_SECTORS , +NULL ); +if (unlikely (ret)) { +dprintk ("%s bl_mark_sectors_init fail %d\n" , + __func__, ret); +end_page_writeback (page); +page_cache_release (page); + wdata->pnfs_error = ret; + goto out; + } + bio =bl_add_page_to_bio (bio, npg_zero,WRITE , + isect, page, be, + bl_end_io_write_zero, par); +if (IS_ERR (bio)) { + wdata->pnfs_error =PTR_ERR (bio); + goto out; + } +/* FIXME: This should be done in bi_end_io */ +mark_extents_written (BLK_LSEG2EXT (wdata->lseg), + page->index <<PAGE_CACHE_SHIFT , +PAGE_CACHE_SIZE ); +next_page: + isect +=PAGE_CACHE_SECTORS ; + extent_length -=PAGE_CACHE_SECTORS ; + } +if (last) + goto write_done; + } + bio =bl_submit_bio (WRITE , bio); + +/* Middle pages */ + pg_index = wdata->args.pgbase >>PAGE_CACHE_SHIFT ;for (i = pg_index; i < wdata->npages ; i++) {if (!extent_length) {/* We've used up the previous extent */ -put_extent (be); +bl_put_extent (be); bio =bl_submit_bio (WRITE , bio);/* Get the next one */ - be =find_get_extent (BLK_LSEG2EXT (wdata->lseg), + be =bl_find_get_extent (BLK_LSEG2EXT (wdata->lseg), isect,NULL );if (!be || !is_writable (be, isect)) { -/* FIXME */ -bl_done_with_wpage (pages[i],0 ); -break ; + wdata->pnfs_error = -EINVAL ; + goto out; } extent_length = be->be_length - (isect - be->be_f_offset); } -for (;;) { -if (!bio) { - bio =bio_alloc (GFP_NOIO , wdata->npages - i); -if (!bio) { -/* Error out this page */ -/* FIXME */ -bl_done_with_wpage (pages[i],0 ); -break ; +if (be->be_state ==PNFS_BLOCK_INVALID_DATA ) { + ret =bl_mark_sectors_init (be->be_inval, isect, +PAGE_CACHE_SECTORS , +NULL ); +if (unlikely (ret)) { +dprintk ("%s bl_mark_sectors_init fail %d\n" , + __func__, ret); + wdata->pnfs_error = ret; + goto out; } - bio->bi_sector = isect - be->be_f_offset + - be->be_v_offset; - bio->bi_bdev = be->be_mdev; - bio->bi_end_io = bl_end_io_write; - bio->bi_private = par; } -if (bio_add_page (bio, pages[i],PAGE_SIZE ,0 )) -break ; + bio =bl_add_page_to_bio (bio, wdata->npages - i,WRITE , + isect, pages[i], be, + bl_end_io_write, par); +if (IS_ERR (bio)) { + wdata->pnfs_error =PTR_ERR (bio); + goto out; + } + isect +=PAGE_CACHE_SECTORS ; + last_isect = isect; + extent_length -=PAGE_CACHE_SECTORS ; + } + +/* Last page inside INVALID extent */ +if (be->be_state ==PNFS_BLOCK_INVALID_DATA ) { bio =bl_submit_bio (WRITE , bio); + npg_zero = npg_per_block - + (last_isect >>PAGE_CACHE_SECTOR_SHIFT ) % npg_per_block; +if (npg_zero < npg_per_block) { + last =1 ; + goto fill_invalid_ext; } - isect +=PAGE_CACHE_SIZE >>9 ; - extent_length -=PAGE_CACHE_SIZE >>9 ; } - wdata->res.count = (isect <<9 ) - (offset); -if (count < wdata->res.count) + +write_done: + wdata->res.count = (last_isect <<SECTOR_SHIFT ) - (offset); +if (count < wdata->res.count) { wdata->res.count = count; -put_extent (be); + } +out: +bl_put_extent (be);bl_submit_bio (WRITE , bio);put_parallel (par);return PNFS_ATTEMPTED ;
@@ -515,7 +699,7 @@ release_extents(struct pnfs_block_layout *bl, struct pnfs_layout_range *range) struct pnfs_block_extent, be_node);list_del (&be->be_node); -put_extent (be); +bl_put_extent (be); } }spin_unlock (&bl->bl_ext_lock);
@@ -558,7 +742,7 @@ static struct pnfs_layout_hdr *bl_alloc_layout_hdr(struct inode *inode,INIT_LIST_HEAD (&bl->bl_commit);INIT_LIST_HEAD (&bl->bl_committing); bl->bl_count =0 ; - bl->bl_blocksize =NFS_SERVER (inode)->pnfs_blksize >>9 ; + bl->bl_blocksize =NFS_SERVER (inode)->pnfs_blksize >>SECTOR_SHIFT ;INIT_INVAL_MARKS (&bl->bl_inval, bl->bl_blocksize);return &bl->bl_layout; }
@@ -569,11 +753,8 @@ static void bl_free_lseg(struct pnfs_layout_segment *lseg)kfree (lseg); } -/* Because the generic infrastructure does not correctly merge layouts, -* we pretty much ignore lseg, and store all data layout wide, so we -* can correctly merge. Eventually we should push some correct merge -* behavior up to the generic code, as the current behavior tends to -* cause lots of unnecessary overlapping LAYOUTGET requests. +/* We pretty much ignore lseg, and store all data layout wide, so we +* can correctly merge. */ static struct pnfs_layout_segment *bl_alloc_lseg(struct pnfs_layout_hdr *lo, struct nfs4_layoutget_res *lgr,
@@ -583,9 +764,9 @@ static struct pnfs_layout_segment *bl_alloc_lseg(struct pnfs_layout_hdr *lo,int status;dprintk ("%s enter\n" , __func__); - lseg =kzalloc (sizeof (*lseg) +0 , gfp_flags); + lseg =kzalloc (sizeof (*lseg), gfp_flags);if (!lseg) -return NULL ; +return ERR_PTR (-ENOMEM ); status =nfs4_blk_process_layoutget (lo, lgr, gfp_flags);if (status) {/* We don't want to call the full-blown bl_free_lseg,
@@ -659,19 +840,19 @@ nfs4_blk_get_deviceinfo(struct nfs_server *server, const struct nfs_fh *fh,dprintk ("%s max_resp_sz %u max_pages %d\n" , __func__, max_resp_sz, max_pages); - dev =kmalloc (sizeof (*dev),GFP_KERNEL ); + dev =kmalloc (sizeof (*dev),GFP_NOFS );if (!dev) {dprintk ("%s kmalloc failed\n" , __func__);return NULL ; } - pages =kzalloc (max_pages *sizeof (struct page *),GFP_KERNEL ); + pages =kzalloc (max_pages *sizeof (struct page *),GFP_NOFS );if (pages ==NULL ) {kfree (dev);return NULL ; }for (i =0 ; i < max_pages; i++) { - pages[i] =alloc_page (GFP_KERNEL ); + pages[i] =alloc_page (GFP_NOFS );if (!pages[i]) goto out_free; }
@@ -721,7 +902,7 @@ bl_set_layoutdriver(struct nfs_server *server, const struct nfs_fh *fh)dprintk ("%s Server did not return blksize\n" , __func__);return -EINVAL ; } - b_mt_id =kzalloc (sizeof (struct block_mount_id ),GFP_KERNEL ); + b_mt_id =kzalloc (sizeof (struct block_mount_id ),GFP_NOFS );if (!b_mt_id) { status = -ENOMEM ; goto out_error;
@@ -730,9 +911,11 @@ bl_set_layoutdriver(struct nfs_server *server, const struct nfs_fh *fh)spin_lock_init (&b_mt_id->bm_lock);INIT_LIST_HEAD (&b_mt_id->bm_devlist); - dlist =kmalloc (sizeof (struct pnfs_devicelist ),GFP_KERNEL ); -if (!dlist) + dlist =kmalloc (sizeof (struct pnfs_devicelist ),GFP_NOFS ); +if (!dlist) { + status = -ENOMEM ; goto out_error; + } dlist->eof =0 ;while (!dlist->eof) { status =nfs4_proc_getdevicelist (server, fh, dlist);
@@ -783,268 +966,14 @@ bl_clear_layoutdriver(struct nfs_server *server)return 0 ; } -/* STUB - mark intersection of layout and page as bad, so is not -* used again. -*/ -static void mark_bad_read (void ) -{ -return ; -} - -/* Copied from buffer.c */ -static void __end_buffer_read_notouch (struct buffer_head *bh,int uptodate) -{ -if (uptodate) { -set_buffer_uptodate (bh); - }else { -/* This happens, due to failed READA attempts. */ -clear_buffer_uptodate (bh); - } -unlock_buffer (bh); -} - -/* Copied from buffer.c */ -static void end_buffer_read_nobh (struct buffer_head *bh,int uptodate) -{ -__end_buffer_read_notouch (bh, uptodate); -} - -/* -* map_block: map a requested I/0 block (isect) into an offset in the LVM -* meta block_device -*/ -static void -map_block (sector_t isect,struct pnfs_block_extent *be,struct buffer_head *bh) -{ -dprintk ("%s enter be=%p\n" , __func__, be); - -set_buffer_mapped (bh); - bh->b_bdev = be->be_mdev; - bh->b_blocknr = (isect - be->be_f_offset + be->be_v_offset) >> - (be->be_mdev->bd_inode->i_blkbits -9 ); - -dprintk ("%s isect %ld, bh->b_blocknr %ld, using bsize %Zd\n" , - __func__, (long )isect, - (long )bh->b_blocknr, - bh->b_size); -return ; -} - -/* Given an unmapped page, zero it (or read in page for COW), -* and set appropriate flags/markings, but it is safe to not initialize -* the range given in [from, to). -*/ -/* This is loosely based on nobh_write_begin */ -static int -init_page_for_write (struct pnfs_block_layout *bl,struct page *page, -unsigned from,unsigned to,sector_t **pages_to_mark) -{ -struct buffer_head *bh; -int inval, ret = -EIO ; -struct pnfs_block_extent *be =NULL , *cow_read =NULL ; -sector_t isect; - -dprintk ("%s enter, %p\n" , __func__, page); - bh =alloc_page_buffers (page,PAGE_CACHE_SIZE ,0 ); -if (!bh) { - ret = -ENOMEM ; - goto cleanup; - } - - isect = (sector_t )page->index << (PAGE_CACHE_SHIFT -9 ); - be =find_get_extent (bl, isect, &cow_read); -if (!be) - goto cleanup; - inval =is_hole (be, isect); -dprintk ("%s inval=%i, from=%u, to=%u\n" , __func__, inval, from, to); -if (inval) { -if (be->be_state ==PNFS_BLOCK_NONE_DATA ) { -dprintk ("%s PANIC - got NONE_DATA extent %p\n" , - __func__, be); - goto cleanup; - } -map_block (isect, be, bh); -unmap_underlying_metadata (bh->b_bdev, bh->b_blocknr); - } -if (PageUptodate (page)) { -/* Do nothing */ - }else if (inval & !cow_read) { -zero_user_segments (page,0 , from, to,PAGE_CACHE_SIZE ); - }else if (0 < from ||PAGE_CACHE_SIZE > to) { -struct pnfs_block_extent *read_extent; - - read_extent = (inval && cow_read) ? cow_read : be; -map_block (isect, read_extent, bh); -lock_buffer (bh); - bh->b_end_io = end_buffer_read_nobh; -submit_bh (READ , bh); -dprintk ("%s: Waiting for buffer read\n" , __func__); -/* XXX Don't really want to hold layout lock here */ -wait_on_buffer (bh); -if (!buffer_uptodate (bh)) - goto cleanup; - } -if (be->be_state ==PNFS_BLOCK_INVALID_DATA ) { -/* There is a BUG here if is a short copy after write_begin, -* but I think this is a generic fs bug. The problem is that -* we have marked the page as initialized, but it is possible -* that the section not copied may never get copied. -*/ - ret =mark_initialized_sectors (be->be_inval, isect, -PAGE_CACHE_SECTORS , - pages_to_mark); -/* Want to preallocate mem so above can't fail */ -if (ret) - goto cleanup; - } -SetPageMappedToDisk (page); - ret =0 ; - -cleanup: -free_buffer_head (bh); -put_extent (be); -put_extent (cow_read); -if (ret) { -/* Need to mark layout with bad read...should now -* just use nfs4 for reads and writes. -*/ -mark_bad_read (); - } -return ret; -} - -static int -bl_write_begin (struct pnfs_layout_segment *lseg,struct page *page,loff_t pos, -unsigned count,struct pnfs_fsdata *fsdata) -{ -unsigned from, to; -int ret; -sector_t *pages_to_mark =NULL ; -struct pnfs_block_layout *bl =BLK_LSEG2EXT (lseg); - -dprintk ("%s enter, %u@%lld\n" , __func__, count, pos); -print_page (page); -/* The following code assumes blocksize >= PAGE_CACHE_SIZE */ -if (bl->bl_blocksize < (PAGE_CACHE_SIZE >>9 )) { -dprintk ("%s Can't handle blocksize %llu\n" , __func__, - (u64 )bl->bl_blocksize); -put_lseg (fsdata->lseg); - fsdata->lseg =NULL ; -return 0 ; - } -if (PageMappedToDisk (page)) { -/* Basically, this is a flag that says we have -* successfully called write_begin already on this page. -*/ -/* NOTE - there are cache consistency issues here. -* For example, what if the layout is recalled, then regained? -* If the file is closed and reopened, will the page flags -* be reset? If not, we'll have to use layout info instead of -* the page flag. -*/ -return 0 ; - } - from = pos & (PAGE_CACHE_SIZE -1 ); - to = from + count; - ret =init_page_for_write (bl, page, from, to, &pages_to_mark); -if (ret) { -dprintk ("%s init page failed with %i" , __func__, ret); -/* Revert back to plain NFS and just continue on with -* write. This assumes there is no request attached, which -* should be true if we get here. -*/ -BUG_ON (PagePrivate (page)); -put_lseg (fsdata->lseg); - fsdata->lseg =NULL ; -kfree (pages_to_mark); - ret =0 ; - }else { - fsdata->private = pages_to_mark; - } -return ret; -} - -/* CAREFUL - what happens if copied < count??? */ -static int -bl_write_end (struct inode *inode,struct page *page,loff_t pos, -unsigned count,unsigned copied,struct pnfs_layout_segment *lseg) -{ -dprintk ("%s enter, %u@%lld, lseg=%p\n" , __func__, count, pos, lseg); -print_page (page); -if (lseg) -SetPageUptodate (page); -return 0 ; -} - -/* Return any memory allocated to fsdata->private, and take advantage -* of no page locks to mark pages noted in write_begin as needing -* initialization. -*/ -static void -bl_write_end_cleanup (struct file *filp,struct pnfs_fsdata *fsdata) -{ -struct page *page; -pgoff_t index; -sector_t *pos; -struct address_space *mapping = filp->f_mapping; -struct pnfs_fsdata *fake_data; -struct pnfs_layout_segment *lseg; - -if (!fsdata) -return ; - lseg = fsdata->lseg; -if (!lseg) -return ; - pos = fsdata->private; -if (!pos) -return ; -dprintk ("%s enter with pos=%llu\n" , __func__, (u64)(*pos)); -for (; *pos != ~0 ; pos++) { - index = *pos >> (PAGE_CACHE_SHIFT -9 ); -/* XXX How do we properly deal with failures here??? */ - page =grab_cache_page_write_begin (mapping, index,0 ); -if (!page) { -printk (KERN_ERR "%s BUG BUG BUG NoMem\n" , __func__); -continue ; - } -dprintk ("%s: Examining block page\n" , __func__); -print_page (page); -if (!PageMappedToDisk (page)) { -/* XXX How do we properly deal with failures here??? */ -dprintk ("%s Marking block page\n" , __func__); -init_page_for_write (BLK_LSEG2EXT (fsdata->lseg), page, -PAGE_CACHE_SIZE ,PAGE_CACHE_SIZE , -NULL ); -print_page (page); - fake_data =kzalloc (sizeof (*fake_data),GFP_KERNEL ); -if (!fake_data) { -printk (KERN_ERR "%s BUG BUG BUG NoMem\n" , - __func__); -unlock_page (page); -continue ; - } -get_lseg (lseg); - fake_data->lseg = lseg; - fake_data->bypass_eof =1 ; - mapping->a_ops->write_end (filp, mapping, - index <<PAGE_CACHE_SHIFT , -PAGE_CACHE_SIZE , -PAGE_CACHE_SIZE , - page, fake_data); -/* Note fake_data is freed by nfs_write_end */ - }else -unlock_page (page); - } -kfree (fsdata->private); - fsdata->private =NULL ; -} -static const struct nfs_pageio_ops bl_pg_read_ops = { + .pg_init = pnfs_generic_pg_init_read, .pg_test = pnfs_generic_pg_test, .pg_doio = nfs_generic_pg_readpages, };static const struct nfs_pageio_ops bl_pg_write_ops = { + .pg_init = pnfs_generic_pg_init_write, .pg_test = pnfs_generic_pg_test, .pg_doio = nfs_generic_pg_writepages, };
@@ -1054,9 +983,6 @@ static struct pnfs_layoutdriver_type blocklayout_type = { .name = "LAYOUT_BLOCK_VOLUME", .read_pagelist = bl_read_pagelist, .write_pagelist = bl_write_pagelist, - .write_begin = bl_write_begin, - .write_end = bl_write_end, - .write_end_cleanup = bl_write_end_cleanup, .alloc_layout_hdr = bl_alloc_layout_hdr, .free_layout_hdr = bl_free_layout_hdr, .alloc_lseg = bl_alloc_lseg,
fs/nfs/blocklayout/blocklayout.h +9 -57
108 lines not on this page · raw message
fs/nfs/blocklayout/blocklayoutdev.c +31 -23
122 lines not on this page · raw message
fs/nfs/blocklayout/blocklayoutdm.c +3 -14
@@ -38,15 +38,6 @@#define NFSDBG_FACILITY NFSDBG_PNFS_LD -/* Defines used for calculating memory usage in nfs4_blk_flatten() */ -#define ARGSIZE 24/* Max bytes needed for linear target arg string */ -#define SPECSIZE (sizeof8(struct dm_target_spec) + ARGSIZE) -#define SPECS_PER_PAGE (PAGE_SIZE / SPECSIZE) -#define SPEC_HEADER_ADJUST (SPECS_PER_PAGE - \ - (PAGE_SIZE - sizeof8(struct dm_ioctl)) / SPECSIZE) -#define roundup8 (x) (((x)+7) & ~7) -#define sizeof8 (x) roundup8(sizeof(x)) -static int dev_remove (dev_t dev) {int ret =1 ;
@@ -90,18 +81,17 @@ out:/* * Release meta device */ -static int nfs4_blk_metadev_release (struct pnfs_block_dev *bdev) +static void nfs4_blk_metadev_release (struct pnfs_block_dev *bdev) {int rv;dprintk ("%s Releasing\n" , __func__); -/* XXX Check return? */ rv =nfs4_blkdev_put (bdev->bm_mdev); -dprintk ("%s nfs4_blkdev_put returns %d\n" , __func__, rv); +if (rv) +printk ("%s nfs4_blkdev_put returns %d\n" , __func__, rv); rv =dev_remove (bdev->bm_mdev->bd_dev);dprintk ("%s Returns %d\n" , __func__, rv); -return rv; }void free_block_dev (struct pnfs_block_dev *bdev)
@@ -112,7 +102,6 @@ void free_block_dev(struct pnfs_block_dev *bdev) __func__,MAJOR (bdev->bm_mdev->bd_dev), MINOR(bdev->bm_mdev->bd_dev)); -/* XXX Check status ?? */ nfs4_blk_metadev_release (bdev); }kfree (bdev);
fs/nfs/blocklayout/extents.c +43 -43
290 lines not on this page · raw message
fs/nfs/file.c +3 -23
@@ -384,15 +384,12 @@ static int nfs_write_begin(struct file *file, struct address_space *mapping,pgoff_t index = pos >>PAGE_CACHE_SHIFT ;struct page *page;int once_thru =0 ; -struct pnfs_layout_segment *lseg;dfprintk (PAGECACHE ,"NFS: write_begin(%s/%s(%ld), %u@%lld)\n" , file->f_path.dentry->d_parent->d_name.name, file->f_path.dentry->d_name.name, mapping->host->i_ino, len, (long long ) pos); - lseg =pnfs_update_layout (mapping->host, -nfs_file_open_context (file), - pos, len,IOMODE_RW ,GFP_NOFS ); + start:/* * Prevent starvation issues if someone is doing a consistency
@@ -412,9 +409,6 @@ start:if (ret) {unlock_page (page);page_cache_release (page); - *pagep =NULL ; - *fsdata =NULL ; - goto out; }else if (!once_thru &&nfs_want_read_modify_write (file, page, pos, len)) { once_thru =1 ;
@@ -423,12 +417,6 @@ start:if (!ret) goto start; } - ret =pnfs_write_begin (file, page, pos, len, lseg, fsdata); - out: -if (ret) { -put_lseg (lseg); - *fsdata =NULL ; - }return ret; }
@@ -438,7 +426,6 @@ static int nfs_write_end(struct file *file, struct address_space *mapping, {unsigned offset = pos & (PAGE_CACHE_SIZE -1 );int status; -struct pnfs_layout_segment *lseg; dfprintk(PAGECACHE, "NFS: write_end(%s/%s(%ld), %u@%lld)\n", file->f_path.dentry->d_parent->d_name.name,
@@ -465,17 +452,10 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,zero_user_segment (page, pglen,PAGE_CACHE_SIZE ); } - lseg =nfs4_pull_lseg_from_fsdata (file, fsdata); - status =pnfs_write_end (file, page, pos, len, copied, lseg); -if (status) - goto out; - status =nfs_updatepage (file, page, offset, copied, lseg, fsdata); + status =nfs_updatepage (file, page, offset, copied); -out:unlock_page (page);page_cache_release (page); -pnfs_write_end_cleanup (file, fsdata); -put_lseg (lseg);if (status <0 )return status;
@@ -597,7 +577,7 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) ret =VM_FAULT_LOCKED ;if (nfs_flush_incompatible (filp, page) ==0 && -nfs_updatepage (filp, page,0 , pagelen,NULL ,NULL ) ==0 ) +nfs_updatepage (filp, page,0 , pagelen) ==0 ) goto out; ret =VM_FAULT_SIGBUS ;
fs/nfs/nfs4filelayout.c +1 -1
@@ -170,7 +170,7 @@ filelayout_set_layoutcommit(struct nfs_write_data *wdata)pnfs_set_layoutcommit (wdata);dprintk ("%s ionde %lu pls_end_pos %lu\n" , __func__, wdata->inode->i_ino, - (unsigned long ) wdata->lseg->pls_end_pos); + (unsigned long )NFS_I (wdata->inode)->layout->plh_lwb); }/*
fs/nfs/nfs4proc.c +7 -1
@@ -5963,10 +5963,16 @@ nfs4_layoutcommit_done(struct rpc_task *task, void *calldata)static void nfs4_layoutcommit_release (void *calldata) {struct nfs4_layoutcommit_data *data = calldata; +struct pnfs_layout_segment *lseg, *tmp;pnfs_cleanup_layoutcommit (data->args.inode, data);/* Matched by references in pnfs_set_layoutcommit */ -put_lseg (data->lseg); +list_for_each_entry_safe (lseg, tmp, &data->lseg_list, pls_lc_list) { +list_del_init (&lseg->pls_lc_list); +if (test_and_clear_bit (NFS_LSEG_LAYOUTCOMMIT , + &lseg->pls_flags)) +put_lseg (lseg); + }put_rpccred (data->cred);kfree (data); }
fs/nfs/nfs4xdr.c +2 -2
@@ -2679,7 +2679,7 @@ static void nfs4_xdr_enc_setclientid_confirm(struct rpc_rqst *req,struct compound_hdr hdr = { .nops =0 , }; -const u32 lease_bitmap[3 ] = {FATTR4_WORD0_LEASE_TIME ,0 ,0 }; +const u32 lease_bitmap[3 ] = {FATTR4_WORD0_LEASE_TIME };encode_compound_hdr (xdr, req, &hdr);encode_setclientid_confirm (xdr, arg, &hdr);
@@ -2823,7 +2823,7 @@ static void nfs4_xdr_enc_get_lease_time(struct rpc_rqst *req,struct compound_hdr hdr = { .minorversion =nfs4_xdr_minorversion (&args->la_seq_args), }; -const u32 lease_bitmap[3 ] = {FATTR4_WORD0_LEASE_TIME ,0 ,0 }; +const u32 lease_bitmap[3 ] = {FATTR4_WORD0_LEASE_TIME };encode_compound_hdr (xdr, req, &hdr);encode_sequence (xdr, &args->la_seq_args, &hdr);
fs/nfs/pnfs.c +24 -96
215 lines not on this page · raw message
fs/nfs/pnfs.h +3 -118
203 lines not on this page · raw message
fs/nfs/sysctl.c +0 -10
@@ -14,7 +14,6 @@#include <linux/nfs_fs.h> #include "callback.h" -#include "pnfs.h" #ifdef CONFIG_NFS_V4 static const int nfs_set_port_min =0 ;
@@ -43,15 +42,6 @@ static ctl_table nfs_cb_sysctls[] = { },#endif /* CONFIG_NFS_USE_NEW_IDMAPPER */ #endif -#ifdef CONFIG_NFS_V4_1 - { - .procname = "pnfs_layout_prefetch_kb", - .data = &pnfs_layout_prefetch_kb, - .maxlen = sizeof(pnfs_layout_prefetch_kb), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif { .procname = "nfs_mountpoint_timeout", .data = &nfs_mountpoint_expiry_timeout,
fs/nfs/write.c +3 -7
@@ -673,9 +673,7 @@ out: }static int nfs_writepage_setup (struct nfs_open_context *ctx,struct page *page, -unsigned int offset,unsigned int count, -struct pnfs_layout_segment *lseg,void *fsdata) - +unsigned int offset,unsigned int count) {struct nfs_page *req;
@@ -683,7 +681,6 @@ static int nfs_writepage_setup(struct nfs_open_context *ctx, struct page *page,if (IS_ERR (req))return PTR_ERR (req);/* Update file length */ -if (pnfs_grow_ok (lseg, fsdata))nfs_grow_file (page, offset, count);nfs_mark_uptodate (page, req->wb_pgbase, req->wb_bytes);nfs_mark_request_dirty (req);
@@ -737,8 +734,7 @@ static int nfs_write_pageuptodate(struct page *page, struct inode *inode)* things with a page scheduled for an RPC call (e.g. invalidate it). */ int nfs_updatepage (struct file *file,struct page *page, -unsigned int offset,unsigned int count, -struct pnfs_layout_segment *lseg,void *fsdata) +unsigned int offset,unsigned int count) {struct nfs_open_context *ctx =nfs_file_open_context (file);struct inode *inode = page->mapping->host;
@@ -763,7 +759,7 @@ int nfs_updatepage(struct file *file, struct page *page, offset =0 ; } - status =nfs_writepage_setup (ctx, page, offset, count, lseg, fsdata); + status =nfs_writepage_setup (ctx, page, offset, count);if (status <0 )nfs_set_pageerror (page);
include/linux/nfs_fs.h +1 -2
@@ -510,8 +510,7 @@ extern int nfs_congestion_kb;extern int nfs_writepage (struct page *page,struct writeback_control *wbc);extern int nfs_writepages (struct address_space *,struct writeback_control *);extern int nfs_flush_incompatible (struct file *file,struct page *page); -extern int nfs_updatepage (struct file *,struct page *,unsigned int , -unsigned int ,struct pnfs_layout_segment *,void *); +extern int nfs_updatepage (struct file *,struct page *,unsigned int ,unsigned int );extern void nfs_writeback_done (struct rpc_task *,struct nfs_write_data *);/*
include/linux/nfs_xdr.h +1 -1
@@ -275,7 +275,7 @@ struct nfs4_layoutcommit_res {struct nfs4_layoutcommit_data {struct rpc_task task;struct nfs_fattr fattr; -struct pnfs_layout_segment *lseg; +struct list_head lseg_list;struct rpc_cred *cred;struct nfs4_layoutcommit_args args;struct nfs4_layoutcommit_res res;
Benny Halevy wrote:
I've pulled (rebased actually) your for-trond branch into my tree. The new tip is at pnfs-all-3.0-rc7-2011-07-14
I have pushed out yet another patch set, this time based on Trond's new (since yesterday) IO code. On the for-trond branch.
Again, this is a pull request for Benny, not Trond. Maybe I should rename the branch.
Quoted 10 lines · Jim Rees
Benny Halevy wrote:
I've pulled (rebased actually) your for-trond branch into my tree. The new tip is at pnfs-all-3.0-rc7-2011-07-14
I have pushed out yet another patch set, this time based on Trond's new (since yesterday) IO code. On the for-trond branch.
Again, this is a pull request for Benny, not Trond. Maybe I should rename the branch.
Thanks, I pulled in Trond's for-next branch and linux-pnfs-blk/for-trond. I also updated panlayout pgio vectors.
This was pushed out under pnfs-all-3.0-rc7-2011-07-17
Benny
Jim Rees wrote:
You can pull the current block layout patches from the for-trond branch of:
git://citi.umich.edu/projects/linux-pnfs-blk.git
This is based on Linux v3.0-rc5 but will soon be rebased on Trond's nfs-for-next.
Small correction: this is actually based on commit 331c925, which was the tip of nfs-for-next until Trond released his new IO code.