Commit 85847280 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFSv4: Allow writebacks to request 'blocks used' 



When doing a non-pNFS write, allow the writeback code to specify that it
also needs to update 'blocks used'.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 86439fa2

fs/nfs/nfs4_fs.h

+2 −0
Original line number Diff line number Diff line
@@ -315,6 +315,8 @@ extern int nfs4_set_rw_stateid(nfs4_stateid *stateid, 
		const struct nfs_open_context *ctx,

		const struct nfs_lock_context *l_ctx,

		fmode_t fmode);

extern void nfs4_bitmask_set(__u32 bitmask[], const __u32 src[],

			     struct inode *inode, unsigned long cache_validity);

extern int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle,

			     struct nfs_fattr *fattr, struct inode *inode);

extern int update_open_stateid(struct nfs4_state *state,

fs/nfs/nfs4proc.c

+7 −14
Original line number Diff line number Diff line
@@ -108,10 +108,6 @@ static int nfs41_test_stateid(struct nfs_server *, nfs4_stateid *, 
static int nfs41_free_stateid(struct nfs_server *, const nfs4_stateid *,

		const struct cred *, bool);

#endif

static void nfs4_bitmask_set(__u32 bitmask[NFS4_BITMASK_SZ],

			     const __u32 *src, struct inode *inode,

			     struct nfs_server *server,

			     struct nfs4_label *label);



#ifdef CONFIG_NFS_V4_SECURITY_LABEL

static inline struct nfs4_label *
@@ -3669,7 +3665,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) 
		if (!nfs4_have_delegation(inode, FMODE_READ)) {

			nfs4_bitmask_set(calldata->arg.bitmask_store,

					 server->cache_consistency_bitmask,

					 inode, server, NULL);

					 inode, 0);

			calldata->arg.bitmask = calldata->arg.bitmask_store;

		} else

			calldata->arg.bitmask = NULL;
@@ -5432,14 +5428,14 @@ bool nfs4_write_need_cache_consistency_data(struct nfs_pgio_header *hdr) 
	return nfs4_have_delegation(hdr->inode, FMODE_READ) == 0;

}



static void nfs4_bitmask_set(__u32 bitmask[NFS4_BITMASK_SZ], const __u32 *src,

			     struct inode *inode, struct nfs_server *server,

			     struct nfs4_label *label)

void nfs4_bitmask_set(__u32 bitmask[], const __u32 src[],

		      struct inode *inode, unsigned long cache_validity)

{

	unsigned long cache_validity = READ_ONCE(NFS_I(inode)->cache_validity);

	struct nfs_server *server = NFS_SERVER(inode);

	unsigned int i;



	memcpy(bitmask, src, sizeof(*bitmask) * NFS4_BITMASK_SZ);

	cache_validity |= READ_ONCE(NFS_I(inode)->cache_validity);



	if (cache_validity & NFS_INO_INVALID_CHANGE)

		bitmask[0] |= FATTR4_WORD0_CHANGE;
@@ -5451,8 +5447,6 @@ static void nfs4_bitmask_set(__u32 bitmask[NFS4_BITMASK_SZ], const __u32 *src, 
		bitmask[1] |= FATTR4_WORD1_OWNER | FATTR4_WORD1_OWNER_GROUP;

	if (cache_validity & NFS_INO_INVALID_NLINK)

		bitmask[1] |= FATTR4_WORD1_NUMLINKS;

	if (label && label->len && cache_validity & NFS_INO_INVALID_LABEL)

		bitmask[2] |= FATTR4_WORD2_SECURITY_LABEL;

	if (cache_validity & NFS_INO_INVALID_CTIME)

		bitmask[1] |= FATTR4_WORD1_TIME_METADATA;

	if (cache_validity & NFS_INO_INVALID_MTIME)
@@ -5479,7 +5473,7 @@ static void nfs4_proc_write_setup(struct nfs_pgio_header *hdr, 
	} else {

		nfs4_bitmask_set(hdr->args.bitmask_store,

				 server->cache_consistency_bitmask,

				 hdr->inode, server, NULL);

				 hdr->inode, NFS_INO_INVALID_BLOCKS);

		hdr->args.bitmask = hdr->args.bitmask_store;

	}
@@ -6517,8 +6511,7 @@ static int _nfs4_proc_delegreturn(struct inode *inode, const struct cred *cred, 
	data->args.fhandle = &data->fh;

	data->args.stateid = &data->stateid;

	nfs4_bitmask_set(data->args.bitmask_store,

			 server->cache_consistency_bitmask, inode, server,

			 NULL);

			 server->cache_consistency_bitmask, inode, 0);

	data->args.bitmask = data->args.bitmask_store;

	nfs_copy_fh(&data->fh, NFS_FH(inode));

	nfs4_stateid_copy(&data->stateid, stateid);