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

Commit e5370bd9 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFSv4.2: Always flush out writes in nfs42_proc_fallocate() 



[ Upstream commit 99f23783224355e7022ceea9b8d9f62c0fd01bd8 ]

Whether we're allocating or delallocating space, we should flush out the
pending writes in order to avoid races with attribute updates.

Fixes: 1e564d3d ("NFSv4.2: Fix a race in nfs42_proc_deallocate()")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 85b1a9c3

fs/nfs/nfs42proc.c

+9 −7
Original line number Original line Diff line number Diff line
@@ -59,7 +59,8 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, 
static int nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep,

static int nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep,

				loff_t offset, loff_t len)

				loff_t offset, loff_t len)

{

{

	struct nfs_server *server = NFS_SERVER(file_inode(filep));

	struct inode *inode = file_inode(filep);

	struct nfs_server *server = NFS_SERVER(inode);

	struct nfs4_exception exception = { };

	struct nfs4_exception exception = { };

	struct nfs_lock_context *lock;

	struct nfs_lock_context *lock;

	int err;

	int err;
@@ -68,9 +69,13 @@ static int nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, 
	if (IS_ERR(lock))

	if (IS_ERR(lock))

		return PTR_ERR(lock);

		return PTR_ERR(lock);





	exception.inode = file_inode(filep);

	exception.inode = inode;

	exception.state = lock->open_context->state;

	exception.state = lock->open_context->state;





	err = nfs_sync_inode(inode);

	if (err)

		goto out;



	do {

	do {

		err = _nfs42_proc_fallocate(msg, filep, lock, offset, len);

		err = _nfs42_proc_fallocate(msg, filep, lock, offset, len);

		if (err == -ENOTSUPP) {

		if (err == -ENOTSUPP) {
@@ -79,7 +84,7 @@ static int nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, 
		}

		}

		err = nfs4_handle_exception(server, err, &exception);

		err = nfs4_handle_exception(server, err, &exception);

	} while (exception.retry);

	} while (exception.retry);



out:

	nfs_put_lock_context(lock);

	nfs_put_lock_context(lock);

	return err;

	return err;

}

}
@@ -117,16 +122,13 @@ int nfs42_proc_deallocate(struct file *filep, loff_t offset, loff_t len) 
		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	inode_lock(inode);

	inode_lock(inode);

	err = nfs_sync_inode(inode);

	if (err)

		goto out_unlock;





	err = nfs42_proc_fallocate(&msg, filep, offset, len);

	err = nfs42_proc_fallocate(&msg, filep, offset, len);

	if (err == 0)

	if (err == 0)

		truncate_pagecache_range(inode, offset, (offset + len) -1);

		truncate_pagecache_range(inode, offset, (offset + len) -1);

	if (err == -EOPNOTSUPP)

	if (err == -EOPNOTSUPP)

		NFS_SERVER(inode)->caps &= ~NFS_CAP_DEALLOCATE;

		NFS_SERVER(inode)->caps &= ~NFS_CAP_DEALLOCATE;

out_unlock:



	inode_unlock(inode);

	inode_unlock(inode);

	return err;

	return err;

}

}