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

Commit 87f26f9b authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: declare nfs4_recoverydir properly 



Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 9c0b0ff7

fs/nfsd/nfsctl.c

+0 −2
Original line number Diff line number Diff line
@@ -1008,8 +1008,6 @@ static ssize_t write_gracetime(struct file *file, char *buf, size_t size) 
	return nfsd4_write_time(file, buf, size, &nfsd4_grace);

}



extern char *nfs4_recoverydir(void);



static ssize_t __write_recoverydir(struct file *file, char *buf, size_t size)

{

	char *mesg = buf;

fs/nfsd/nfsd.h

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ int nfs4_state_start(void); 
void nfs4_state_shutdown(void);

void nfs4_reset_lease(time_t leasetime);

int nfs4_reset_recoverydir(char *recdir);

char * nfs4_recoverydir(void);

#else

static inline void nfs4_state_init(void) { }

static inline int nfsd4_init_slabs(void) { return 0; }
@@ -132,6 +133,7 @@ static inline int nfs4_state_start(void) { return 0; } 
static inline void nfs4_state_shutdown(void) { }

static inline void nfs4_reset_lease(time_t leasetime) { }

static inline int nfs4_reset_recoverydir(char *recdir) { return 0; }

static inline char * nfs4_recoverydir(void) {return NULL; }

#endif



/*