[PATCH] knfsd: nfsd4: rename nfs4_state_init (76a3550e) · Commits · 戴 / test

fs/nfsd/nfs4state.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -3185,7 +3185,7 @@ nfs4_check_open_reclaim(clientid_t *clid)
		*/

		static void
		__nfs4_state_init(void)
		__nfs4_state_start(void)
		{
		int i;
		time_t grace_time;
		@@ -3235,7 +3235,7 @@ __nfs4_state_init(void)
		}

		int
		nfs4_state_init(void)
		nfs4_state_start(void)
		{
		int status;

		@@ -3244,7 +3244,7 @@ nfs4_state_init(void)
		status = nfsd4_init_slabs();
		if (status)
		return status;
		__nfs4_state_init();
		__nfs4_state_start();
		nfs4_init = 1;
		return 0;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ nfsd_svc(unsigned short port, int nrservs)
		error = nfsd_racache_init(2*nrservs);
		if (error<0)
		goto out;
		error = nfs4_state_init();
		error = nfs4_state_start();
		if (error<0)
		goto out;
		if (!nfsd_serv) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -145,12 +145,12 @@ int nfsd_set_posix_acl(struct svc_fh , int, struct posix_acl );
		* NFSv4 State
		*/
		#ifdef CONFIG_NFSD_V4
		int nfs4_state_init(void);
		int nfs4_state_start(void);
		void nfs4_state_shutdown(void);
		time_t nfs4_lease_time(void);
		void nfs4_reset_lease(time_t leasetime);
		#else
		static inline int nfs4_state_init(void){return 0;}
		static inline int nfs4_state_start(void){return 0;}
		static inline void nfs4_state_shutdown(void){}
		static inline time_t nfs4_lease_time(void){return 0;}
		static inline void nfs4_reset_lease(time_t leasetime){}