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

Commit 5d2cc520 authored by Tigran Mkrtchyan's avatar Tigran Mkrtchyan Committed by Greg Kroah-Hartman
Browse files

flexfiles: enforce per-mirror stateid only for v4 DSes 



commit 320f35b7bf8cccf1997ca3126843535e1b95e9c4 upstream.

Since commit bb21ce0ad227 we always enforce per-mirror stateid.
However, this makes sense only for v4+ servers.

Signed-off-by: default avatarTigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 891e5a89

fs/nfs/flexfilelayout/flexfilelayout.c

+4 −2
Original line number Diff line number Diff line
@@ -1725,7 +1725,8 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr) 
	if (fh)

		hdr->args.fh = fh;



	if (!nfs4_ff_layout_select_ds_stateid(lseg, idx, &hdr->args.stateid))

	if (vers == 4 &&

		!nfs4_ff_layout_select_ds_stateid(lseg, idx, &hdr->args.stateid))

		goto out_failed;



	/*
@@ -1790,7 +1791,8 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync) 
	if (fh)

		hdr->args.fh = fh;



	if (!nfs4_ff_layout_select_ds_stateid(lseg, idx, &hdr->args.stateid))

	if (vers == 4 &&

		!nfs4_ff_layout_select_ds_stateid(lseg, idx, &hdr->args.stateid))

		goto out_failed;



	/*