Update to UBUNTU: Ubuntu-aws-5.4.0-1080.87

[grwilson]

Merge conflict:

diff --cc fs/nfsd/filecache.c
index 79ad6b2c9608,d88313196a90..000000000000
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@@ -645,12 -579,8 +645,17 @@@ nfsd_file_cache_init(void
  	if (nfsd_file_hashtbl)
  		return 0;

++<<<<<<< HEAD
 +	nfsd_filecache_wq = alloc_workqueue("nfsd_filecache", 0, 0);
 +	if (!nfsd_filecache_wq)
 +		goto out;
 +
 +	nfsd_file_hashtbl = kcalloc(NFSD_FILE_HASH_SIZE,
 +				sizeof(*nfsd_file_hashtbl), GFP_KERNEL);
++=======
+ 	nfsd_file_hashtbl = kvzalloc(array_size(NFSD_FILE_HASH_SIZE,
+ 				sizeof(*nfsd_file_hashtbl)), GFP_KERNEL);
++>>>>>>> 8b459b82d725 (DLPX-74216 nfs-server restarts fail when order-5 allocations are exhausted (#3))
  	if (!nfsd_file_hashtbl) {
  		pr_err("nfsd: unable to allocate nfsd_file_hashtbl\n");
  		goto out_err;
@@@ -716,10 -646,8 +721,10 @@@ out_err
  	nfsd_file_slab = NULL;
  	kmem_cache_destroy(nfsd_file_mark_slab);
  	nfsd_file_mark_slab = NULL;
- 	kfree(nfsd_file_hashtbl);
+ 	kvfree(nfsd_file_hashtbl);
  	nfsd_file_hashtbl = NULL;
 +	destroy_workqueue(nfsd_filecache_wq);
 +	nfsd_filecache_wq = NULL;
  	goto out;
  }

@@@ -864,10 -710,8 +869,10 @@@ nfsd_file_cache_shutdown(void
  	fsnotify_wait_marks_destroyed();
  	kmem_cache_destroy(nfsd_file_mark_slab);
  	nfsd_file_mark_slab = NULL;
- 	kfree(nfsd_file_hashtbl);
+ 	kvfree(nfsd_file_hashtbl);
  	nfsd_file_hashtbl = NULL;
 +	destroy_workqueue(nfsd_filecache_wq);
 +	nfsd_filecache_wq = NULL;
  }

[sebroy]

I might be reading the diff wrong, but is the diff showing that we're now allocating nfsd_file_hashtbl twice, once using kcalloc() and then again using kvzalloc()? Our local change was to replace kcalloc() with kvzalloc(), right?

[grwilson]

I might be reading the diff wrong, but is the diff showing that we're now allocating nfsd_file_hashtbl twice, once using kcalloc() and then again using kvzalloc()? Our local change was to replace kcalloc() with kvzalloc(), right?

Our local change is to keep the kvzalloc() line and add the alloc_workqueue change.

[grwilson]

ab-pre-push: http://selfservice.jenkins.delphix.com/job/appliance-build-orchestrator-pre-push/2295/

[grwilson]

Another ab-pre-push: http://selfservice.jenkins.delphix.com/job/appliance-build-orchestrator-pre-push/2307/