diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-06 04:00:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-06 04:00:37 +0200 |
| commit | a8f46b5afe1c0a83c3013a339e6aeccc2f37342d (patch) | |
| tree | 83400e22faa4d383e7e0b385940790f796f0793e /fs | |
| parent | Merge tag 'drm-fixes-2019-07-05-1' of git://anongit.freedesktop.org/drm/drm (diff) | |
| parent | nfsd: Fix overflow causing non-working mounts on 1 TB machines (diff) | |
| download | linux-a8f46b5afe1c0a83c3013a339e6aeccc2f37342d.tar.xz linux-a8f46b5afe1c0a83c3013a339e6aeccc2f37342d.zip | |
Merge tag 'nfsd-5.2-2' of git://linux-nfs.org/~bfields/linux
Pull nfsd fixes from Bruce Fields:
"Two more quick bugfixes for nfsd: fixing a regression causing mount
failures on high-memory machines and fixing the DRC over RDMA"
* tag 'nfsd-5.2-2' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix overflow causing non-working mounts on 1 TB machines
svcrdma: Ignore source port when computing DRC hash
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 618e66078ee5..1a0cdeb3b875 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1563,7 +1563,7 @@ static u32 nfsd4_get_drc_mem(struct nfsd4_channel_attrs *ca) * Never use more than a third of the remaining memory, * unless it's the only way to give this client a slot: */ - avail = clamp_t(int, avail, slotsize, total_avail/3); + avail = clamp_t(unsigned long, avail, slotsize, total_avail/3); num = min_t(int, num, avail / slotsize); nfsd_drc_mem_used += num * slotsize; spin_unlock(&nfsd_drc_lock); |