pnfsd-block: block layout should cleanup when register nfsd filesystem error
Subsystems (2)
PATCH 2/2 pnfsd-block: block layout should cleanup when register nfsd filesystem error
this patch can do:
1. remove /proc/fs/pnfs_block when create /proc/fs/pnfs_block/ctl error.
2. cleanup /proc/fs/pnfs_block and /proc/fs/pnfs_block/ctl when register nfsd filesystem error.
--- fs/nfsd/bl_com.c | 4 +++- fs/nfsd/bl_ops.c | 12 ++++++++++-- fs/nfsd/nfsctl.c | 7 +++++-- fs/nfsd/nfsd4_block.h | 6 ++++-- 4 files changed, 22 insertions(+), 7 deletions(-)
fs/nfsd/bl_com.c +3 -1
@@ -281,8 +281,10 @@ bl_init_proc(void)return -ENOMEM ; e =create_proc_entry ("fs/pnfs_block/ctl" ,0 ,NULL ); -if (!e) +if (!e) { +remove_proc_entry ("fs/pnfs_block" ,NULL );return -ENOMEM ; + } e->proc_fops = &ctl_ops;return 0 ;
fs/nfsd/bl_ops.c +10 -2
@@ -120,17 +120,25 @@ static boolean_t extents_process(struct fiemap_extent_info *fei, u64 sbid, dev_t dev, pnfs_blocklayout_layout_t *b);static void extents_cleanup (struct fiemap_extent_info *fei); -void +int nfsd_bl_init (void ) {int i; +dprintk ("%s loaded\n" , __func__);spin_lock_init (&layout_hashtbl_lock);INIT_LIST_HEAD (&layout_hash);for (i =0 ; i <BL_LAYOUT_HASH_SIZE ; i++)INIT_LIST_HEAD (&layout_hashtbl[i]); -bl_init_proc (); +return bl_init_proc (); +} + +void +nfsd_bl_cleanup (void ) +{ +remove_proc_entry ("fs/pnfs_block/ctl" ,NULL ); +remove_proc_entry ("fs/pnfs_block" ,NULL ); }/*
fs/nfsd/nfsctl.c +5 -2
@@ -1204,8 +1204,9 @@ static int create_proc_exports_entry(void)static int __init init_nfsd (void ) {int retval; -printk (KERN_INFO "Installing knfsd (copyright (C) 1996 [email protected]).\n" ); +int bl_retval; +printk (KERN_INFO "Installing knfsd (copyright (C) 1996 [email protected]).\n" ); retval =nfsd4_init_slabs ();if (retval)return retval;
@@ -1227,7 +1228,7 @@ static int __init init_nfsd(void) retval =create_proc_exports_entry ();if (retval) goto out_free_idmap; -nfsd_bl_init (); + bl_retval =nfsd_bl_init (); retval =register_filesystem (&nfsd_fs_type);if (retval)
@@ -1236,6 +1237,8 @@ static int __init init_nfsd(void) out_free_all:remove_proc_entry ("fs/nfs/exports" ,NULL );remove_proc_entry ("fs/nfs" ,NULL ); +if (!bl_retval) +nfsd_bl_cleanup (); out_free_idmap:nfsd_idmap_shutdown (); out_free_lockd:
fs/nfsd/nfsd4_block.h +4 -2
@@ -78,7 +78,8 @@ typedef struct bl_comm {#ifdef CONFIG_PNFSD_BLOCK bool pnfs_block_enabled (struct inode *,int ex_flags); -void nfsd_bl_init (void ); +int nfsd_bl_init (void ); +void nfsd_bl_cleanup (void );int bl_layout_type (struct super_block *sb);int bl_getdeviceiter (struct super_block *,u32 layout_type,struct nfsd4_pnfs_dev_iter_res *);
@@ -112,7 +113,8 @@ extern bl_comm_t *bl_comm_global; // Ugly...#else static inline bool pnfs_block_enabled (struct inode *i,int ex_flags) {return false; } -static inline void nfsd_bl_init (void ) {} +static inline int nfsd_bl_init (void ) {return false; } +static inline void nfsd_bl_cleanup (void ) {}static inline int bl_recall_layout (struct inode *inode,int type,u64 offset,u64 len,bool with_nfs4_state_lock)
Signature · 1 line
1.5.5.1
this patch can fix:
1. remove /proc/fs/pnfs_block when create /proc/fs/pnfs_block/ctl error.
2. cleanup /proc/fs/pnfs_block and /proc/fs/pnfs_block/ctl when register nfsd filesystem error.
3. we can't use proc file when CONFIG_PROC_FS is not set.
---
--- fs/nfsd/bl_com.c | 21 ++++++++++++++++++--- fs/nfsd/bl_ops.c | 5 +++-- fs/nfsd/nfsctl.c | 7 +++++-- fs/nfsd/nfsd4_block.h | 12 ++++++++++-- 4 files changed, 36 insertions(+), 9 deletions(-)
fs/nfsd/bl_com.c +18 -3
@@ -1,3 +1,4 @@ +#if defined(CONFIG_PNFSD_BLOCK )#include <linux/module.h> #include <linux/mutex.h> #include <linux/init.h>
@@ -271,19 +272,33 @@ static struct file_operations ctl_ops = {* more nodes doesn't present itself shortly this code should revert * to a single top level node. McNeal 11-Aug-2008. */ +#if defined(CONFIG_PROC_FS ) +int bl_init_proc (void ) {struct proc_dir_entry *e; - e =proc_mkdir ("fs/pnfs_block" ,NULL ); -if (!e) + pnfs_block_entry =proc_mkdir ("fs/pnfs_block" ,NULL ); +if (!pnfs_block_entry)return -ENOMEM ; e =create_proc_entry ("fs/pnfs_block/ctl" ,0 ,NULL ); -if (!e) +if (!e) { +remove_proc_entry ("fs/pnfs_block" ,NULL );return -ENOMEM ; + } e->proc_fops = &ctl_ops;return 0 ; } + +void +bl_cleanup_proc (void ) +{ +remove_proc_entry ("fs/pnfs_block/ctl" ,NULL ); +remove_proc_entry ("fs/pnfs_block" ,NULL ); +} + +#endif /*CONFIG_PROC_FS*/ +#endif /*CONFIG_PNFSD_BLOCK*/
fs/nfsd/bl_ops.c +3 -2
@@ -120,17 +120,18 @@ static boolean_t extents_process(struct fiemap_extent_info *fei, u64 sbid, dev_t dev, pnfs_blocklayout_layout_t *b);static void extents_cleanup (struct fiemap_extent_info *fei); -void +int nfsd_bl_init (void ) {int i; +dprintk ("%s loaded\n" , __func__);spin_lock_init (&layout_hashtbl_lock);INIT_LIST_HEAD (&layout_hash);for (i =0 ; i <BL_LAYOUT_HASH_SIZE ; i++)INIT_LIST_HEAD (&layout_hashtbl[i]); -bl_init_proc (); +return bl_init_proc (); }/*
fs/nfsd/nfsctl.c +5 -2
@@ -1204,8 +1204,9 @@ static int create_proc_exports_entry(void)static int __init init_nfsd (void ) {int retval; -printk (KERN_INFO "Installing knfsd (copyright (C) 1996 [email protected]).\n" ); +int bl_retval; +printk (KERN_INFO "Installing knfsd (copyright (C) 1996 [email protected]).\n" ); retval =nfsd4_init_slabs ();if (retval)return retval;
@@ -1227,7 +1228,7 @@ static int __init init_nfsd(void) retval =create_proc_exports_entry ();if (retval) goto out_free_idmap; -nfsd_bl_init (); + bl_retval =nfsd_bl_init (); retval =register_filesystem (&nfsd_fs_type);if (retval)
@@ -1236,6 +1237,8 @@ static int __init init_nfsd(void) out_free_all:remove_proc_entry ("fs/nfs/exports" ,NULL );remove_proc_entry ("fs/nfs" ,NULL ); +if (!bl_retval) +bl_cleanup_proc (); out_free_idmap:nfsd_idmap_shutdown (); out_free_lockd:
fs/nfsd/nfsd4_block.h +10 -2
@@ -78,7 +78,7 @@ typedef struct bl_comm {#ifdef CONFIG_PNFSD_BLOCK bool pnfs_block_enabled (struct inode *,int ex_flags); -void nfsd_bl_init (void ); +int nfsd_bl_init (void );int bl_layout_type (struct super_block *sb);int bl_getdeviceiter (struct super_block *,u32 layout_type,struct nfsd4_pnfs_dev_iter_res *);
@@ -94,7 +94,13 @@ int bl_layoutcommit(struct inode *,int bl_layoutreturn (struct inode *,const struct nfsd4_pnfs_layoutreturn_arg *);int bl_layoutrecall (struct inode *inode,int type,u64 offset,u64 len,bool with_nfs4_state_lock); +#ifdef CONFIG_PROC_FS +int bl_init_proc (void ); +void bl_cleanup_proc (void ); + +#endif +int bl_upcall (bl_comm_t *,bl_comm_msg_t *,bl_comm_res_t **);
@@ -112,7 +118,9 @@ extern bl_comm_t *bl_comm_global; // Ugly...#else static inline bool pnfs_block_enabled (struct inode *i,int ex_flags) {return false; } -static inline void nfsd_bl_init (void ) {} +static inline int nfsd_bl_init (void ) {return false; } +static inline int bl_init_proc (void ) {return false; } +static inline void bl_cleanup_proc (void ) {}static inline int bl_recall_layout (struct inode *inode,int type,u64 offset,u64 len,bool with_nfs4_state_lock)
Signature · 1 line
1.5.5.1
Quoted 11 lines · fanchaoting
this patch can fix:
1. remove
/proc/fs/pnfs_blockwhen create/proc/fs/pnfs_block/ctlerror.2. cleanup
/proc/fs/pnfs_blockand/proc/fs/pnfs_block/ctlwhen register nfsd filesystem error.
3. we can't use proc file whenCONFIG_PROC_FSis not set.Signed-off-by fanchaoting <[email protected]>Reviewed-by chendt.fnst <[email protected]>
Merged into the pnfsd-block branch.
One question though: why do you need the #if defined(CONFIG_PNFSD_BLOCK) in bl_com.c?
The file is compiled conditionally on that same config variable in fs/nfsd/Makefile.
Thanks,
Benny
Quoted 15 lines
---
--- fs/nfsd/bl_com.c | 21 ++++++++++++++++++--- fs/nfsd/bl_ops.c | 5 +++-- fs/nfsd/nfsctl.c | 7 +++++-- fs/nfsd/nfsd4_block.h | 12 ++++++++++-- 4 files changed, 36 insertions(+), 9 deletions(-)fs/nfsd/bl_com.c +0
-0
fs/nfsd/bl_com.c line 1
Quoted 1 line
fs/nfsd/bl_com.c +1
-0@@ -1,3 +1,4 @@ +#if defined(CONFIG_PNFSD_BLOCK )
Why?
Benny
Quoted 137 lines
fs/nfsd/bl_com.c +17
-3#include <linux/module.h> #include <linux/mutex.h> #include <linux/init.h> @@ -271,19 +272,33 @@ static struct file_operations ctl_ops = {* more nodes doesn't present itself shortly this code should revert * to a single top level node. McNeal 11-Aug-2008. */ +#if defined(CONFIG_PROC_FS ) +int bl_init_proc (void ) {struct proc_dir_entry *e; - e =proc_mkdir ("fs/pnfs_block" ,NULL ); -if (!e) + pnfs_block_entry =proc_mkdir ("fs/pnfs_block" ,NULL ); +if (!pnfs_block_entry)return -ENOMEM ; e =create_proc_entry ("fs/pnfs_block/ctl" ,0 ,NULL ); -if (!e) +if (!e) { +remove_proc_entry ("fs/pnfs_block" ,NULL );return -ENOMEM ; + } e->proc_fops = &ctl_ops;return 0 ; } + +void +bl_cleanup_proc (void ) +{ +remove_proc_entry ("fs/pnfs_block/ctl" ,NULL ); +remove_proc_entry ("fs/pnfs_block" ,NULL ); +} + +#endif /*CONFIG_PROC_FS*/ +#endif /*CONFIG_PNFSD_BLOCK*/ fs/nfsd/bl_ops.c +3
-2@@ -120,17 +120,18 @@ static boolean_t extents_process(struct fiemap_extent_info *fei, u64 sbid, dev_t dev, pnfs_blocklayout_layout_t *b);static void extents_cleanup (struct fiemap_extent_info *fei); -void +int nfsd_bl_init (void ) {int i; +dprintk ("%s loaded\n" , __func__);spin_lock_init (&layout_hashtbl_lock);INIT_LIST_HEAD (&layout_hash);for (i =0 ; i <BL_LAYOUT_HASH_SIZE ; i++)INIT_LIST_HEAD (&layout_hashtbl[i]); -bl_init_proc (); +return bl_init_proc (); }/* fs/nfsd/nfsctl.c +5
-2@@ -1204,8 +1204,9 @@ static int create_proc_exports_entry(void)static int __init init_nfsd (void ) {int retval; -printk (KERN_INFO "Installing knfsd (copyright (C) 1996 [email protected]).\n" ); +int bl_retval; +printk (KERN_INFO "Installing knfsd (copyright (C) 1996 [email protected]).\n" ); retval =nfsd4_init_slabs ();if (retval)return retval;@@ -1227,7 +1228,7 @@ static int __init init_nfsd(void) retval =create_proc_exports_entry ();if (retval) goto out_free_idmap; -nfsd_bl_init (); + bl_retval =nfsd_bl_init (); retval =register_filesystem (&nfsd_fs_type);if (retval)@@ -1236,6 +1237,8 @@ static int __init init_nfsd(void) out_free_all:remove_proc_entry ("fs/nfs/exports" ,NULL );remove_proc_entry ("fs/nfs" ,NULL ); +if (!bl_retval) +bl_cleanup_proc (); out_free_idmap:nfsd_idmap_shutdown (); out_free_lockd:fs/nfsd/nfsd4_block.h +10
-2@@ -78,7 +78,7 @@ typedef struct bl_comm {#ifdef CONFIG_PNFSD_BLOCK bool pnfs_block_enabled (struct inode *,int ex_flags); -void nfsd_bl_init (void ); +int nfsd_bl_init (void );int bl_layout_type (struct super_block *sb);int bl_getdeviceiter (struct super_block *,u32 layout_type,struct nfsd4_pnfs_dev_iter_res *);@@ -94,7 +94,13 @@ int bl_layoutcommit(struct inode *,int bl_layoutreturn (struct inode *,const struct nfsd4_pnfs_layoutreturn_arg *);int bl_layoutrecall (struct inode *inode,int type,u64 offset,u64 len,bool with_nfs4_state_lock); +#ifdef CONFIG_PROC_FS +int bl_init_proc (void ); +void bl_cleanup_proc (void ); + +#endif +int bl_upcall (bl_comm_t *,bl_comm_msg_t *,bl_comm_res_t **);@@ -112,7 +118,9 @@ extern bl_comm_t *bl_comm_global; // Ugly...#else static inline bool pnfs_block_enabled (struct inode *i,int ex_flags) {return false; } -static inline void nfsd_bl_init (void ) {} +static inline int nfsd_bl_init (void ) {return false; } +static inline int bl_init_proc (void ) {return false; } +static inline void bl_cleanup_proc (void ) {}static inline int bl_recall_layout (struct inode *inode,int type,u64 offset,u64 len,bool with_nfs4_state_lock)