Restore non-file layout code version 2
Subsystems (2)
cover Restore non-file layout code version 2
Applies to 2.6.34-rc5 pnfs-submit branch on top of the "pNFS generic devce ID cache version 3" and " Remove non-file layout code from submit tree version 2"
This patch set restores object and block functionality removed in the pnfs-submit tree.
Adjust to using the generic device id cache.
Permanetly remove structure fields and function parameters not used by any layout driver.
Note: struct nfs_server pnfs_mount_type pointer was removed as it was unused due to the generic deviceid cache. The file layout driver does not need a private data pointer in struct nfs_server, and currently, neither does the object nor block layout driver. Once code is submitted that needs a private data pointer, (as I'm told is on the way) we can add one.
Note: The CB_NOTIFY_DEVICEID code is incomplete in that all layout segments referring to the 'to be removed device id' need to be reaped, and all in-flight I/O drained prior to device id removal.
Note: The generic device id cache means that there is no longer any need for a per layout driver delete_deviceid call. 0001-pnfs_post_submit-restore-CB_NOTIFY_DEVICEID.patch
For the block layout driver: Please review and test.
Note: new getdevicelist layoutdriver_io_operation. 0002-pnfs_post_submit-restore-GETDEVICELIST.patch 0003-pnfs_post_submit-add-getdevicelist-io-operation.patch
For the object layout driver. Please review and test.
Note: Just removed the unused ds_wpages and ds_rpages. 0004-pnfs_post_submit-restore-ds_wsize-and-ds_rsize.patch 0005-pnfs_post_submit-restore-get_blocksize-policy-operat.patch
Testing:
-------
The file layout driver does not use this code, so I could not test, and the code has changed due to the generic device id cache.
I did run Connectathon to smoke test that the file layout functionality has not changed.
-->Andy
PATCH 1/5 pnfs_post_submit: restore CB_NOTIFY_DEVICEID
From: Andy Adamson <[email protected]>
Reverts "pnfs_submit: remove CB_NOTIFY_DEVICEID"
and replaces "pnfs_submit: remove filelayout CB_NOTIFY_DEVICE support"
With the generic device id cache, there is no need for a per layout driver delete_deviceid function.
Note: This functionlaity is incomplete as all layout segments referring to the 'to be removed device id' need to be reaped, and all in flight I/O drained.
--- fs/nfs/callback_proc.c | 53 ++++++++++++++++++++++++ fs/nfs/callback_xdr.c | 97 ++++++++++++++++++++++++++++++++++++++++++++- fs/nfs/pnfs.c | 16 ++++++- include/linux/nfs4_pnfs.h | 2 + 4 files changed, 165 insertions(+), 3 deletions(-)
fs/nfs/callback_proc.c +53 -0
@@ -325,6 +325,59 @@ out:return res; } +/* Remove the deviceid(s) from the nfs_client deviceid cache */ +static __be32 pnfs_devicenotify_client (struct nfs_client *clp, +struct cb_pnfs_devicenotifyargs *args) +{ +uint32_t type; +int i; + +dprintk ("%s: --> clp %p\n" , __func__, clp); + +for (i =0 ; i < args->ndevs; i++) { +struct cb_pnfs_devicenotifyitem *dev = &args->devs[i]; + type = dev->cbd_notify_type; +if (type ==NOTIFY_DEVICEID4_DELETE && clp->cl_devid_cache) +nfs4_delete_device (clp->cl_devid_cache, + &dev->cbd_dev_id); +else if (type ==NOTIFY_DEVICEID4_CHANGE ) +printk (KERN_ERR "%s: NOTIFY_DEVICEID4_CHANGE " +"not supported\n" , __func__); + } +return 0 ; +} + +__be32 pnfs_cb_devicenotify (struct cb_pnfs_devicenotifyargs *args, +void *dummy) +{ +struct nfs_client *clp; +__be32 res =0 ; +unsigned int num_client =0 ; + +dprintk ("%s: -->\n" , __func__); + + res =__constant_htonl (NFS4ERR_INVAL ); + clp =nfs_find_client (args->addr,4 ); +if (clp ==NULL ) { +dprintk ("%s: no client for addr %u.%u.%u.%u\n" , + __func__,NIPQUAD (args->addr)); + goto out; + } + +do { +struct nfs_client *prev = clp; + num_client++; + res =pnfs_devicenotify_client (clp, args); + clp =nfs_find_client_next (prev); +nfs_put_client (prev); + }while (clp !=NULL ); + +out: +dprintk ("%s: exit with status = %d numclient %u\n" , + __func__,ntohl (res), num_client); +return res; +} +int nfs41_validate_delegation_stateid (struct nfs_delegation *delegation,const nfs4_stateid *stateid) {if (delegation ==NULL )
fs/nfs/callback_xdr.c +96 -1
125 lines not on this page · raw message
fs/nfs/pnfs.c +14 -2
@@ -2359,7 +2359,8 @@ nfs4_add_deviceid(struct nfs4_deviceid_cache *c, struct nfs4_deviceid *new)EXPORT_SYMBOL (nfs4_add_deviceid);static int -nfs4_remove_deviceid (struct nfs4_deviceid_cache *c,long hash) +nfs4_remove_deviceid (struct nfs4_deviceid_cache *c,long hash, +struct pnfs_deviceid *id) {struct nfs4_deviceid *d;struct hlist_node *n;
@@ -2367,6 +2368,8 @@ nfs4_remove_deviceid(struct nfs4_deviceid_cache *c, long hash)dprintk ("--> %s hash %ld\n" , __func__, hash);spin_lock (&c->dc_lock);hlist_for_each_entry_rcu (d, n, &c->dc_deviceids[hash], de_node) { +if (id &&memcmp (id, &d->de_id,NFS4_PNFS_DEVICEID4_SIZE )) +continue ;hlist_del_rcu (&d->de_node);spin_unlock (&c->dc_lock);synchronize_rcu ();
@@ -2379,6 +2382,15 @@ nfs4_remove_deviceid(struct nfs4_deviceid_cache *c, long hash)return 0 ; } +void +nfs4_delete_device (struct nfs4_deviceid_cache *c,struct pnfs_deviceid *id) +{ +long hash =nfs4_deviceid_hash (id); + +nfs4_remove_deviceid (c, hash, id); +} +EXPORT_SYMBOL (nfs4_delete_device); +static void nfs4_free_deviceid_cache (struct kref *kref) {
@@ -2390,7 +2402,7 @@ nfs4_free_deviceid_cache(struct kref *kref)for (i =0 ; i <NFS4_DEVICE_ID_HASH_SIZE ; i++) { more =1 ;while (more) - more =nfs4_remove_deviceid (cache, i); + more =nfs4_remove_deviceid (cache, i,NULL ); }kfree (cache); }
include/linux/nfs4_pnfs.h +2 -0
@@ -304,6 +304,8 @@ extern void nfs4_set_layout_deviceid(struct pnfs_layout_segment *,extern void nfs4_unset_layout_deviceid (struct pnfs_layout_segment *,struct nfs4_deviceid *,void (*free_callback)(struct kref *)); +extern void nfs4_delete_device (struct nfs4_deviceid_cache *, +struct pnfs_deviceid *);/* pNFS client callback functions. * These operations allow the layout driver to access pNFS client
Signature · 1 line
1.6.6
PATCH 2/5 pnfs_post_submit: restore GETDEVICELIST
From: Andy Adamson <[email protected]>
The block driver uses GETDEVICELIST
--- fs/nfs/nfs4proc.c | 47 +++++++++++++++++ fs/nfs/nfs4xdr.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ fs/nfs/pnfs.c | 1 + fs/nfs/pnfs.h | 3 + include/linux/nfs4.h | 1 + include/linux/nfs4_pnfs.h | 2 + include/linux/pnfs_xdr.h | 11 ++++ 7 files changed, 191 insertions(+), 0 deletions(-)
fs/nfs/nfs4proc.c +47 -0
@@ -5766,6 +5766,53 @@ out:return status; } +/* +* Retrieve the list of Data Server devices from the MDS. +*/ +static int _nfs4_pnfs_getdevicelist (struct nfs_fh *fh, +struct nfs_server *server, +struct pnfs_devicelist *devlist) +{ +struct nfs4_pnfs_getdevicelist_arg arg = { + .fh = fh, + .layoutclass = server->pnfs_curr_ld->id, + }; +struct nfs4_pnfs_getdevicelist_res res = { + .devlist = devlist, + }; +struct rpc_message msg = { + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_PNFS_GETDEVICELIST ], + .rpc_argp = &arg, + .rpc_resp = &res, + }; +int status; + +dprintk ("--> %s\n" , __func__); + status =nfs4_call_sync (server, &msg, &arg, &res,0 ); +dprintk ("<-- %s status=%d\n" , __func__, status); +return status; +} + +int nfs4_pnfs_getdevicelist (struct super_block *sb, +struct nfs_fh *fh, +struct pnfs_devicelist *devlist) +{ +struct nfs4_exception exception = { }; +struct nfs_server *server =NFS_SB (sb); +int err; + +do { + err =nfs4_handle_exception (server, +_nfs4_pnfs_getdevicelist (fh, server, devlist), + &exception); + }while (exception.retry); + +dprintk ("nfs4_pnfs_getdevlist: err=%d, num_devs=%u\n" , + err, devlist->num_devs); + +return err; +} +int nfs4_pnfs_getdeviceinfo (struct super_block *sb,struct pnfs_device *pdev) {struct nfs_server *server =NFS_SB (sb);
fs/nfs/nfs4xdr.c +126 -0
168 lines not on this page · raw message
fs/nfs/pnfs.c +1 -0
@@ -2237,6 +2237,7 @@ void pnfs_free_fsdata(struct pnfs_fsdata *fsdata)/* Callback operations for layout drivers. */ struct pnfs_client_operations pnfs_ops = { + .nfs_getdevicelist = nfs4_pnfs_getdevicelist, .nfs_getdeviceinfo = nfs4_pnfs_getdeviceinfo, .nfs_readlist_complete = pnfs_read_done, .nfs_writelist_complete = pnfs_writeback_done,
fs/nfs/pnfs.h +3 -0
@@ -22,6 +22,9 @@#include "iostat.h" /* nfs4proc.c */ +extern int nfs4_pnfs_getdevicelist (struct super_block *sb, +struct nfs_fh *fh, +struct pnfs_devicelist *devlist);extern int nfs4_pnfs_getdeviceinfo (struct super_block *sb,struct pnfs_device *dev);extern int pnfs4_proc_layoutget (struct nfs4_pnfs_layoutget *lgp);
include/linux/nfs4.h +1 -0
@@ -543,6 +543,7 @@ enum {NFSPROC4_CLNT_PNFS_LAYOUTGET ,NFSPROC4_CLNT_PNFS_LAYOUTCOMMIT ,NFSPROC4_CLNT_PNFS_LAYOUTRETURN , +NFSPROC4_CLNT_PNFS_GETDEVICELIST ,NFSPROC4_CLNT_PNFS_GETDEVICEINFO ,NFSPROC4_CLNT_PNFS_WRITE , NFSPROC4_CLNT_PNFS_COMMIT,
include/linux/nfs4_pnfs.h +2 -0
@@ -313,6 +313,8 @@ extern void nfs4_delete_device(struct nfs4_deviceid_cache *,* E.g., getdeviceinfo, I/O callbacks, etc */ struct pnfs_client_operations { +int (*nfs_getdevicelist) (struct super_block *sb,struct nfs_fh *fh, +struct pnfs_devicelist *devlist);int (*nfs_getdeviceinfo) (struct super_block *sb,struct pnfs_device *dev);
include/linux/pnfs_xdr.h +11 -0
@@ -116,6 +116,17 @@ struct nfs4_pnfs_layoutreturn {int rpc_status; }; +struct nfs4_pnfs_getdevicelist_arg { +const struct nfs_fh *fh; +u32 layoutclass; +struct nfs4_sequence_args seq_args; +}; + +struct nfs4_pnfs_getdevicelist_res { +struct pnfs_devicelist *devlist; +struct nfs4_sequence_res seq_res; +}; +struct nfs4_pnfs_getdeviceinfo_arg {struct pnfs_device *pdev;struct nfs4_sequence_args seq_args;
Signature · 1 line
1.6.6
PATCH 3/5 pnfs_post_submit: add getdevicelist io operation
From: Andy Adamson <[email protected]>
The block layout driver called getdevicelist in it's initialize_mountpoint layoutdriver_io_operation. Since initialize_mountpoint has been moved to nfs_probe_fsinfo where the required super block and file handle are not available, provide a getdevicelist call in nfs4_get_root.
There is no error returned because the layout driver will handle errors internally, and there is no reason to fail the mount.
If GETDEVICELIST fails, the layout driver can
either fall back to NFSv4.1 by calling nfs4_put_deviceid_cache and removing the nfs_server->pnfs_curr_ld pointer, or ignore the error and call GETDEVICEINFO on unresolved device id's presented by LAYOUTGET.
nfs4_pnfs_getdevicelist does call nfs4_handle_exception which handles session level and other errors.
--- fs/nfs/getroot.c | 3 +++ fs/nfs/pnfs.h | 13 +++++++++++++ include/linux/nfs4_pnfs.h | 1 + 3 files changed, 17 insertions(+), 0 deletions(-)
fs/nfs/getroot.c +3 -0
@@ -38,6 +38,7 @@#include "nfs4_fs.h" #include "delegation.h" #include "internal.h" +#include "pnfs.h" #define NFSDBG_FACILITY NFSDBG_CLIENT
@@ -286,6 +287,8 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh)if (!mntroot->d_op) mntroot->d_op = server->nfs_client->rpc_ops->dentry_ops; +nfs4_getdevicelist (sb, mntfh); +dprintk ("<-- nfs4_get_root()\n" );return mntroot; }
fs/nfs/pnfs.h +13 -0
@@ -106,6 +106,13 @@ static inline int pnfs_enabled_sb(struct nfs_server *nfss)return nfss->pnfs_curr_ld !=NULL ; } +static inline void +nfs4_getdevicelist (struct super_block *sb,struct nfs_fh *fh) +{ +if (PNFS_EXISTS_LDIO_OP (NFS_SB (sb), getdevicelist)) +NFS_SB (sb)->pnfs_curr_ld->ld_io_ops->getdevicelist (sb, fh); +} +static inline enum pnfs_try_status pnfs_try_to_read_data (struct nfs_read_data *data,const struct rpc_call_ops *call_ops)
@@ -280,6 +287,12 @@ static inline int pnfs_use_rpc(struct nfs_server *nfss)#else /* CONFIG_NFS_V4_1 */ +static inline void +nfs4_getdevicelist (struct super_block *sb,struct nfs_fh *fh) +{ +return ; +} +static inline enum pnfs_try_status pnfs_try_to_read_data (struct nfs_read_data *data,const struct rpc_call_ops *call_ops)
include/linux/nfs4_pnfs.h +1 -0
@@ -170,6 +170,7 @@ struct layoutdriver_io_operations {*/ int (*initialize_mountpoint) (struct nfs_client *);int (*uninitialize_mountpoint) (struct nfs_server *server); +int (*getdevicelist) (struct super_block *,struct nfs_fh *); };enum layoutdriver_policy_flags {
Signature · 1 line
1.6.6
PATCH 4/5 pnfs_post_submit: restore ds_wsize and ds_rsize
From: Andy Adamson <[email protected]>
The object layout driver uses ds_wsize and ds_rsize
--- fs/nfs/client.c | 4 +++- fs/nfs/pnfs.c | 22 +++++++++++++++++----- fs/nfs/pnfs.h | 7 +++++-- fs/nfs/read.c | 2 +- fs/nfs/write.c | 2 +- include/linux/nfs_fs_sb.h | 2 ++ 6 files changed, 29 insertions(+), 10 deletions(-)
fs/nfs/client.c +3 -1
@@ -879,8 +879,10 @@ static void nfs4_init_pnfs(struct nfs_server *server, struct nfs_fsinfo *fsinfo)struct nfs_client *clp = server->nfs_client;if (nfs4_has_session (clp) && - (clp->cl_exchange_flags &EXCHGID4_FLAG_USE_PNFS_MDS )) + (clp->cl_exchange_flags &EXCHGID4_FLAG_USE_PNFS_MDS )) {set_pnfs_layoutdriver (server, fsinfo->layouttype); +pnfs_set_ds_iosize (server); + }#endif /* CONFIG_NFS_V4_1 */ }
fs/nfs/pnfs.c +17 -5
@@ -1419,7 +1419,8 @@ void pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode, struct nfs_open_context *ctx, - struct list_head *pages) + struct list_head *pages, + size_t *rsize) { struct nfs_server *nfss = NFS_SERVER(inode);size_t count =0 ;
@@ -1440,10 +1441,12 @@ pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,if (count >0 && !below_threshold (inode, count,0 )) { status =pnfs_update_layout (inode, ctx, count, loff,IOMODE_READ ,NULL ); -dprintk ("%s virt update returned %d\n" , __func__, status); +dprintk ("%s *rsize %Zd virt update returned %d\n" , + __func__, *rsize, status);if (status !=0 )return ; + *rsize =NFS_SERVER (inode)->ds_rsize; pgio->pg_boundary =pnfs_getboundary (inode);if (pgio->pg_boundary)pnfs_set_pg_test (inode, pgio);
@@ -1451,7 +1454,8 @@ pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, }void -pnfs_pageio_init_write (struct nfs_pageio_descriptor *pgio,struct inode *inode) +pnfs_pageio_init_write (struct nfs_pageio_descriptor *pgio,struct inode *inode, +size_t *wsize) {struct nfs_server *server =NFS_SERVER (inode);
@@ -1465,6 +1469,7 @@ pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode) pgio->pg_threshold =pnfs_getthreshold (inode,1 ); pgio->pg_boundary =pnfs_getboundary (inode);pnfs_set_pg_test (inode, pgio); + *wsize = server->ds_wsize; }/* Retrieve I/O parameters for O_DIRECT.
@@ -1487,9 +1492,9 @@ _pnfs_direct_init_io(struct inode *inode, struct nfs_open_context *ctx,return ;if (iswrite) - rwsize = nfss->wsize; + rwsize = nfss->ds_wsize;else - rwsize = nfss->rsize; + rwsize = nfss->ds_rsize; boundary =pnfs_getboundary (inode);
@@ -1593,6 +1598,13 @@ pnfs_use_write(struct inode *inode, ssize_t count)return 1 ;/* use pNFS I/O */ } +void +pnfs_set_ds_iosize (struct nfs_server *server) +{ + server->ds_wsize = server->wsize; + server->ds_rsize = server->rsize; +} +static int pnfs_call_done (struct pnfs_call_data *pdata,struct rpc_task *task,void *data) {
fs/nfs/pnfs.h +5 -2
@@ -58,11 +58,14 @@ int pnfs_layoutcommit_inode(struct inode *inode, int sync);void pnfs_update_last_write (struct nfs_inode *nfsi,loff_t offset,size_t extent);void pnfs_need_layoutcommit (struct nfs_inode *nfsi,struct nfs_open_context *ctx);unsigned int pnfs_getiosize (struct nfs_server *server); +void pnfs_set_ds_iosize (struct nfs_server *server);enum pnfs_try_status _pnfs_try_to_commit (struct nfs_write_data *,const struct rpc_call_ops *,int );void pnfs_pageio_init_read (struct nfs_pageio_descriptor *,struct inode *, -struct nfs_open_context *,struct list_head *); -void pnfs_pageio_init_write (struct nfs_pageio_descriptor *,struct inode *); +struct nfs_open_context *,struct list_head *, +size_t *); +void pnfs_pageio_init_write (struct nfs_pageio_descriptor *,struct inode *, +size_t *);void pnfs_update_layout_commit (struct inode *,struct list_head *,pgoff_t ,unsigned int );void pnfs_free_fsdata (struct pnfs_fsdata *fsdata);ssize_t pnfs_file_write (struct file *,const char __user *,size_t ,loff_t *);
fs/nfs/read.c +1 -1
@@ -663,7 +663,7 @@ int nfs_readpages(struct file *filp, struct address_space *mapping, goto read_complete;/* all pages were read */ #ifdef CONFIG_NFS_V4_1 -pnfs_pageio_init_read (&pgio, inode, desc.ctx, pages); +pnfs_pageio_init_read (&pgio, inode, desc.ctx, pages, &rsize);#endif /* CONFIG_NFS_V4_1 */ if (rsize <PAGE_CACHE_SIZE )nfs_pageio_init (&pgio, inode, nfs_pagein_multi, rsize,0 );
fs/nfs/write.c +1 -1
@@ -1009,7 +1009,7 @@ static void nfs_pageio_init_write(struct nfs_pageio_descriptor *pgio,size_t wsize =NFS_SERVER (inode)->wsize;#ifdef CONFIG_NFS_V4_1 -pnfs_pageio_init_write (pgio, inode); +pnfs_pageio_init_write (pgio, inode, &wsize);#endif /* CONFIG_NFS_V4_1 */ if (wsize <PAGE_CACHE_SIZE )
include/linux/nfs_fs_sb.h +2 -0
@@ -164,6 +164,8 @@ struct nfs_server {#ifdef CONFIG_NFS_V4_1 struct pnfs_layoutdriver_type *pnfs_curr_ld;/* Active layout driver */ +unsigned int ds_rsize;/* Data server read size */ +unsigned int ds_wsize;/* Data server write size */ #endif /* CONFIG_NFS_V4_1 */ void (*destroy)(struct nfs_server *);
Signature · 1 line
1.6.6
PATCH 5/5 pnfs_post_submit: restore get_blocksize policy operation
From: Andy Adamson <[email protected]>
The object layout driver is the only consumer of the get_blocksize policy operation.
Note: struct pnfs_mount_type has been removed.
--- fs/nfs/pnfs.c | 25 +++++++++++++++++++++++-- include/linux/nfs4_pnfs.h | 8 ++++++++ 2 files changed, 31 insertions(+), 2 deletions(-)
fs/nfs/pnfs.c +23 -2
@@ -1598,11 +1598,32 @@ pnfs_use_write(struct inode *inode, ssize_t count)return 1 ;/* use pNFS I/O */ } +/* Return I/O buffer size for a layout driver +* This value will determine what size reads and writes +* will be gathered into and sent to the data servers. +* blocksize must be a multiple of the page cache size. +*/ +unsigned int +pnfs_getiosize (struct nfs_server *server) +{ +if (!PNFS_EXISTS_LDPOLICY_OP (server, get_blocksize)) +return 0 ; +return server->pnfs_curr_ld->ld_policy_ops->get_blocksize (); +} +void pnfs_set_ds_iosize (struct nfs_server *server) { - server->ds_wsize = server->wsize; - server->ds_rsize = server->rsize; +unsigned dssize =pnfs_getiosize (server); + +/* Set buffer size for data servers */ +if (dssize >0 ) { + server->ds_rsize = server->ds_wsize = +nfs_block_size (dssize,NULL ); + }else { + server->ds_wsize = server->wsize; + server->ds_rsize = server->rsize; + } } static int
include/linux/nfs4_pnfs.h +8 -0
@@ -202,6 +202,14 @@ struct layoutdriver_policy_operations {int (*do_flush)(struct pnfs_layout_segment *lseg,struct nfs_page *req,struct pnfs_fsdata *fsdata); +/* Retreive the block size of the file system. +* If gather_across_stripes == 1, then the file system will gather +* requests into the block size. +* TODO: Where will the layout driver get this info? It is hard +* coded in PVFS2. +*/ +ssize_t (*get_blocksize) (void ); +/* Read requests under this value are sent to the NFSv4 server */ ssize_t (*get_read_threshold) (struct pnfs_layout_type *,struct inode *);
Signature · 1 line
1.6.6
Quoted 23 lines · On Apr. 30, 2010, 21:27 +0300, [email protected] wrote:
Applies to 2.6.34-rc5 pnfs-submit branch on top of the "pNFS generic devce ID cache version 3" and " Remove non-file layout code from submit tree version 2"
This patch set restores object and block functionality removed in the pnfs-submit tree.
Adjust to using the generic device id cache.
Permanetly remove structure fields and function parameters not used by any layout driver.Note: struct
nfs_serverpnfs_mount_typepointer was removed as it was unused due to the generic deviceid cache. The file layout driver does not need a private data pointer in structnfs_server, and currently, neither does the object nor block layout driver. Once code is submitted that needs a private data pointer, (as I'm told is on the way) we can add one.Note: The
CB_NOTIFY_DEVICEIDcode is incomplete in that all layout segments referring to the 'to be removed device id' need to be reaped, and all in-flight I/O drained prior to device id removal.
Note: The generic device id cache means that there is no longer any need for a per layout driverdelete_deviceidcall. 0001-pnfs_post_submit-restore-CB_NOTIFY_DEVICEID.patch
Quoted 4 lines
For the block layout driver: Please review and test.
Note: new getdevicelistlayoutdriver_io_operation. 0002-pnfs_post_submit-restore-GETDEVICELIST.patch 0003-pnfs_post_submit-add-getdevicelist-io-operation.patch
Patches 1,2, 4,5 committed to the pnfs branch. Thanks!
Benny
Quoted 23 lines
For the object layout driver. Please review and test.
Note: Just removed the unusedds_wpagesandds_rpages. 0004-pnfs_post_submit-restore-ds_wsize-and-ds_rsize.patch 0005-pnfs_post_submit-restore-get_blocksize-policy-operat.patchTesting:
-------The file layout driver does not use this code, so I could not test, and the code has changed due to the generic device id cache.
I did run Connectathon to smoke test that the file layout functionality has not changed.
-->Andy
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html