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

Commit ef311537 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

NFSv4.1 convert layoutcommit sync to boolean 



Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent de4b15c7

fs/nfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ nfs_file_fsync(struct file *file, int datasync) 
		ret = status;

	if (!ret && !datasync)

		/* application has asked for meta-data sync */

		ret = pnfs_layoutcommit_inode(inode, 1);

		ret = pnfs_layoutcommit_inode(inode, true);

	return ret;

}

fs/nfs/nfs4_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ extern int nfs4_init_session(struct nfs_server *server); 
extern int nfs4_proc_get_lease_time(struct nfs_client *clp,

		struct nfs_fsinfo *fsinfo);

extern int nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data,

				  int sync);

				  bool sync);



static inline bool

is_ds_only_client(struct nfs_client *clp)

fs/nfs/nfs4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -5671,7 +5671,7 @@ static const struct rpc_call_ops nfs4_layoutcommit_ops = { 
};



int

nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, int sync)

nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, bool sync)

{

	struct rpc_message msg = {

		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_LAYOUTCOMMIT],
@@ -5699,7 +5699,7 @@ nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, int sync) 
	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task))

		return PTR_ERR(task);

	if (!sync)

	if (sync == false)

		goto out;

	status = nfs4_wait_for_completion_rpc_task(task);

	if (status != 0)

fs/nfs/pnfs.c

+1 −1
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ EXPORT_SYMBOL_GPL(pnfs_set_layoutcommit); 
 * if WRITEs to a data server return NFS_DATA_SYNC.

 */

int

pnfs_layoutcommit_inode(struct inode *inode, int sync)

pnfs_layoutcommit_inode(struct inode *inode, bool sync)

{

	struct nfs4_layoutcommit_data *data;

	struct nfs_inode *nfsi = NFS_I(inode);

fs/nfs/pnfs.h

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ void pnfs_roc_release(struct inode *ino); 
void pnfs_roc_set_barrier(struct inode *ino, u32 barrier);

bool pnfs_roc_drain(struct inode *ino, u32 *barrier);

void pnfs_set_layoutcommit(struct nfs_write_data *wdata);

int pnfs_layoutcommit_inode(struct inode *inode, int sync);

int pnfs_layoutcommit_inode(struct inode *inode, bool sync);



static inline int lo_fail_bit(u32 iomode)

{
@@ -328,7 +328,7 @@ static inline void pnfs_clear_request_commit(struct nfs_page *req) 
{

}



static inline int pnfs_layoutcommit_inode(struct inode *inode, int sync)

static inline int pnfs_layoutcommit_inode(struct inode *inode, bool sync)

{

	return 0;

}