Commit df95a9d4 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

knfsd: cache unregistration needn't return error 



There's really nothing much the caller can do if cache unregistration
fails.  And indeed, all any caller does in this case is print an error
and continue.  So just return void and move the printk's inside
cache_unregister.

Acked-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent d5c3428b

fs/nfsd/export.c

+2 −4
Original line number Diff line number Diff line
@@ -1670,10 +1670,8 @@ nfsd_export_shutdown(void) 


	exp_writelock();



	if (cache_unregister(&svc_expkey_cache))

		printk(KERN_ERR "nfsd: failed to unregister expkey cache\n");

	if (cache_unregister(&svc_export_cache))

		printk(KERN_ERR "nfsd: failed to unregister export cache\n");

	cache_unregister(&svc_expkey_cache);

	cache_unregister(&svc_export_cache);

	svcauth_unix_purge();



	exp_writeunlock();

fs/nfsd/nfs4idmap.c

+2 −4
Original line number Diff line number Diff line
@@ -474,10 +474,8 @@ nfsd_idmap_init(void) 
void

nfsd_idmap_shutdown(void)

{

	if (cache_unregister(&idtoname_cache))

		printk(KERN_ERR "nfsd: failed to unregister idtoname cache\n");

	if (cache_unregister(&nametoid_cache))

		printk(KERN_ERR "nfsd: failed to unregister nametoid cache\n");

	cache_unregister(&idtoname_cache);

	cache_unregister(&nametoid_cache);

}



/*

include/linux/sunrpc/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ extern void cache_flush(void); 
extern void cache_purge(struct cache_detail *detail);

#define NEVER (0x7FFFFFFF)

extern void cache_register(struct cache_detail *cd);

extern int cache_unregister(struct cache_detail *cd);

extern void cache_unregister(struct cache_detail *cd);



extern void qword_add(char **bpp, int *lp, char *str);

extern void qword_addhex(char **bpp, int *lp, char *buf, int blen);

net/sunrpc/auth_gss/svcauth_gss.c

+2 −4
Original line number Diff line number Diff line
@@ -1396,9 +1396,7 @@ gss_svc_init(void) 
void

gss_svc_shutdown(void)

{

	if (cache_unregister(&rsc_cache))

		printk(KERN_ERR "auth_rpcgss: failed to unregister rsc cache\n");

	if (cache_unregister(&rsi_cache))

		printk(KERN_ERR "auth_rpcgss: failed to unregister rsi cache\n");

	cache_unregister(&rsc_cache);

	cache_unregister(&rsi_cache);

	svc_auth_unregister(RPC_AUTH_GSS);

}

net/sunrpc/cache.c

+5 −3
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void cache_register(struct cache_detail *cd) 
	schedule_delayed_work(&cache_cleaner, 0);

}



int cache_unregister(struct cache_detail *cd)

void cache_unregister(struct cache_detail *cd)

{

	cache_purge(cd);

	spin_lock(&cache_list_lock);
@@ -351,7 +351,7 @@ int cache_unregister(struct cache_detail *cd) 
	if (cd->entries || atomic_read(&cd->inuse)) {

		write_unlock(&cd->hash_lock);

		spin_unlock(&cache_list_lock);

		return -EBUSY;

		goto out;

	}

	if (current_detail == cd)

		current_detail = NULL;
@@ -373,7 +373,9 @@ int cache_unregister(struct cache_detail *cd) 
		/* module must be being unloaded so its safe to kill the worker */

		cancel_delayed_work_sync(&cache_cleaner);

	}

	return 0;

	return;

out:

	printk(KERN_ERR "nfsd: failed to unregister %s cache\n", cd->name);

}



/* clean cache tries to find something to clean

CRA Git | Maintained and supported by SUSTech CRA and CCSE