d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable zpl_nr_cached_objects() callback

Browse Source 
The zpl_nr_cached_objects() function has been disabled because in the
current code it doesn't provide any critical functionality and it may
result in a deadlock under certain circumstances.  However, because
we expect to need these hooks in the future this code has not been
entirely removed.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #3719
This commit is contained in:
Brian Behlendorf 2015-09-23 14:28:43 -07:00
parent d4787d55ad
commit 04870568e6
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
module/zfs/zpl_super.c
View File

@ -501,24 +501,11 @@ zpl_prune_sb(int64_t nr_to_scan, void *arg)
static int static int
zpl_nr_cached_objects(struct super_block *sb) zpl_nr_cached_objects(struct super_block *sb)
{ {
zfs_sb_t *zsb = sb->s_fs_info; return (0);
int nr;
mutex_enter(&zsb->z_znodes_lock);
nr = zsb->z_nr_znodes;
mutex_exit(&zsb->z_znodes_lock);
return (nr);
} }
#endif /* HAVE_NR_CACHED_OBJECTS */ #endif /* HAVE_NR_CACHED_OBJECTS */
#ifdef HAVE_FREE_CACHED_OBJECTS #ifdef HAVE_FREE_CACHED_OBJECTS
/*
* Attempt to evict some meta data from the cache. The ARC operates in
* terms of bytes while the Linux VFS uses objects. Now because this is
* just a best effort eviction and the exact values aren't critical so we
* extrapolate from an object count to a byte size using the znode_t size.
*/
static void static void
zpl_free_cached_objects(struct super_block *sb, int nr_to_scan) zpl_free_cached_objects(struct super_block *sb, int nr_to_scan)
{ {