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

Commit a1d1c4f1 authored by Tigran Mkrtchyan's avatar Tigran Mkrtchyan Committed by Anna Schumaker
Browse files

nfs4: client: do not send empty SETATTR after OPEN_CREATE 



OPEN_CREATE with EXCLUSIVE4_1 sends initial file permission.
Ignoring  fact, that server have indicated that file mod is set, client
will send yet another SETATTR request, but, as mode is already set,
new SETATTR will be empty. This is not a problem, nevertheless
an extra roundtrip and slow open on high latency networks.

This change is aims to skip extra setattr after open  if there are
no attributes to be set.

Signed-off-by: default avatarTigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 2e72448b

fs/nfs/nfs4proc.c

+25 −9
Original line number Diff line number Diff line
@@ -74,6 +74,17 @@ 
#define NFS4_POLL_RETRY_MIN	(HZ/10)

#define NFS4_POLL_RETRY_MAX	(15*HZ)



/* file attributes which can be mapped to nfs attributes */

#define NFS4_VALID_ATTRS (ATTR_MODE \

	| ATTR_UID \

	| ATTR_GID \

	| ATTR_SIZE \

	| ATTR_ATIME \

	| ATTR_MTIME \

	| ATTR_CTIME \

	| ATTR_ATIME_SET \

	| ATTR_MTIME_SET)



struct nfs4_opendata;

static int _nfs4_proc_open(struct nfs4_opendata *data);

static int _nfs4_recover_proc_open(struct nfs4_opendata *data);
@@ -2558,7 +2569,11 @@ static int _nfs4_do_open(struct inode *dir, 
	if ((opendata->o_arg.open_flags & (O_CREAT|O_EXCL)) == (O_CREAT|O_EXCL) &&

	    (opendata->o_arg.createmode != NFS4_CREATE_GUARDED)) {

		nfs4_exclusive_attrset(opendata, sattr, &label);



		/*

		 * send create attributes which was not set by open

		 * with an extra setattr.

		 */

		if (sattr->ia_valid & NFS4_VALID_ATTRS) {

			nfs_fattr_init(opendata->o_res.f_attr);

			status = nfs4_do_setattr(state->inode, cred,

					opendata->o_res.f_attr, sattr,
@@ -2569,6 +2584,7 @@ static int _nfs4_do_open(struct inode *dir, 
				nfs_setsecurity(state->inode, opendata->o_res.f_attr, olabel);

			}

		}

	}

	if (opened && opendata->file_created)

		*opened |= FILE_CREATED;