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

Commit e17b1fc4 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Make nfs_commit_alloc() extern 



We need to use nfs_commit_alloc() in fs/nfs/direct.c.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a37ec012

fs/nfs/write.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ static mempool_t *nfs_commit_mempool; 




static DECLARE_WAIT_QUEUE_HEAD(nfs_write_congestion);

static DECLARE_WAIT_QUEUE_HEAD(nfs_write_congestion);





static inline struct nfs_write_data *nfs_commit_alloc(unsigned int pagecount)

struct nfs_write_data *nfs_commit_alloc(unsigned int pagecount)

{

{

	struct nfs_write_data *p = mempool_alloc(nfs_commit_mempool, SLAB_NOFS);

	struct nfs_write_data *p = mempool_alloc(nfs_commit_mempool, SLAB_NOFS);
@@ -112,7 +112,7 @@ static inline struct nfs_write_data *nfs_commit_alloc(unsigned int pagecount) 
	return p;

	return p;

}

}





static inline void nfs_commit_free(struct nfs_write_data *p)

void nfs_commit_free(struct nfs_write_data *p)

{

{

	if (p && (p->pagevec != &p->page_array[0]))

	if (p && (p->pagevec != &p->page_array[0]))

		kfree(p->pagevec);

		kfree(p->pagevec);

include/linux/nfs_fs.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -410,6 +410,11 @@ extern int nfs_updatepage(struct file *, struct page *, unsigned int, unsigned 
extern int nfs_writeback_done(struct rpc_task *, struct nfs_write_data *);

extern int nfs_writeback_done(struct rpc_task *, struct nfs_write_data *);

extern void nfs_writedata_release(void *);

extern void nfs_writedata_release(void *);





#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)

struct nfs_write_data *nfs_commit_alloc(unsigned int pagecount);

void nfs_commit_free(struct nfs_write_data *p);

#endif



/*

/*

 * Try to write back everything synchronously (but check the

 * Try to write back everything synchronously (but check the

 * return value!)

 * return value!)