projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfsd-4.15' of git://linux-nfs.org/~bfields/linux
[linux-2.6-microblaze.git]
/
fs
/
nfsd
/
nfssvc.c
diff --git
a/fs/nfsd/nfssvc.c
b/fs/nfsd/nfssvc.c
index
e02bd27
..
33117d4
100644
(file)
--- a/
fs/nfsd/nfssvc.c
+++ b/
fs/nfsd/nfssvc.c
@@
-447,7
+447,7
@@
void nfsd_reset_versions(void)
*/
static void set_max_drc(void)
{
*/
static void set_max_drc(void)
{
- #define NFSD_DRC_SIZE_SHIFT
10
+ #define NFSD_DRC_SIZE_SHIFT
7
nfsd_drc_max_mem = (nr_free_buffer_pages()
>> NFSD_DRC_SIZE_SHIFT) * PAGE_SIZE;
nfsd_drc_mem_used = 0;
nfsd_drc_max_mem = (nr_free_buffer_pages()
>> NFSD_DRC_SIZE_SHIFT) * PAGE_SIZE;
nfsd_drc_mem_used = 0;
@@
-517,7
+517,7
@@
int nfsd_create_serv(struct net *net)
register_inet6addr_notifier(&nfsd_inet6addr_notifier);
#endif
}
register_inet6addr_notifier(&nfsd_inet6addr_notifier);
#endif
}
-
do_gettimeofday(&nn->nfssvc_boot);
/* record boot time */
+
ktime_get_real_ts64(&nn->nfssvc_boot);
/* record boot time */
return 0;
}
return 0;
}