Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 697ce9be authored by Zhang Yanfei's avatar Zhang Yanfei Committed by Linus Torvalds
Browse files

fs/nfsd: change type of max_delegations, nfsd_drc_max_mem and nfsd_drc_mem_used 



The three variables are calculated from nr_free_buffer_pages so change
their types to unsigned long in case of overflow.

Signed-off-by: default avatarZhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 43be594a

fs/nfsd/nfs4state.c

+3 −3
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ get_nfs4_file(struct nfs4_file *fi) 
}



static int num_delegations;

unsigned int max_delegations;

unsigned long max_delegations;



/*

 * Open owner state (share locks)
@@ -700,7 +700,7 @@ static int nfsd4_get_drc_mem(int slotsize, u32 num) 
	num = min_t(u32, num, NFSD_MAX_SLOTS_PER_SESSION);



	spin_lock(&nfsd_drc_lock);

	avail = min_t(int, NFSD_MAX_MEM_PER_SESSION,

	avail = min((unsigned long)NFSD_MAX_MEM_PER_SESSION,

		    nfsd_drc_max_mem - nfsd_drc_mem_used);

	num = min_t(int, num, avail / slotsize);

	nfsd_drc_mem_used += num * slotsize;

fs/nfsd/nfsd.h

+3 −3
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ extern struct svc_version nfsd_version2, nfsd_version3, 
extern u32			nfsd_supported_minorversion;

extern struct mutex		nfsd_mutex;

extern spinlock_t		nfsd_drc_lock;

extern unsigned int		nfsd_drc_max_mem;

extern unsigned int		nfsd_drc_mem_used;

extern unsigned long		nfsd_drc_max_mem;

extern unsigned long		nfsd_drc_mem_used;



extern const struct seq_operations nfs_exports_op;
@@ -106,7 +106,7 @@ static inline int nfsd_v4client(struct svc_rqst *rq) 
 * NFSv4 State

 */

#ifdef CONFIG_NFSD_V4

extern unsigned int max_delegations;

extern unsigned long max_delegations;

void nfs4_state_init(void);

int nfsd4_init_slabs(void);

void nfsd4_free_slabs(void);

fs/nfsd/nfssvc.c

+3 −3
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ DEFINE_MUTEX(nfsd_mutex); 
 * nfsd_drc_pages_used tracks the current version 4.1 DRC memory usage.

 */

spinlock_t	nfsd_drc_lock;

unsigned int	nfsd_drc_max_mem;

unsigned int	nfsd_drc_mem_used;

unsigned long	nfsd_drc_max_mem;

unsigned long	nfsd_drc_mem_used;



#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)

static struct svc_stat	nfsd_acl_svcstats;
@@ -342,7 +342,7 @@ static void set_max_drc(void) 
					>> NFSD_DRC_SIZE_SHIFT) * PAGE_SIZE;

	nfsd_drc_mem_used = 0;

	spin_lock_init(&nfsd_drc_lock);

	dprintk("%s nfsd_drc_max_mem %u \n", __func__, nfsd_drc_max_mem);

	dprintk("%s nfsd_drc_max_mem %lu \n", __func__, nfsd_drc_max_mem);

}



static int nfsd_get_default_max_blksize(void)