NFSv41: Clean up exclusive create (d77d76ff) · Commits · e / devices / android_kernel_teracube_2e

fs/nfs/nfs4proc.c

+6 −11

Original line number	Diff line number	Diff line
		@@ -744,20 +744,15 @@ static struct nfs4_opendata nfs4_opendata_alloc(struct path path,
		p->o_arg.server = server;
		p->o_arg.bitmask = server->attr_bitmask;
		p->o_arg.claim = NFS4_OPEN_CLAIM_NULL;
		if (flags & O_EXCL) {
		if (nfs4_has_persistent_session(server->nfs_client)) {
		/* GUARDED */
		if (flags & O_CREAT) {
		u32 *s;

		p->o_arg.u.attrs = &p->attrs;
		memcpy(&p->attrs, attrs, sizeof(p->attrs));
		} else { /* EXCLUSIVE4_1 */
		u32 s = (u32 ) p->o_arg.u.verifier.data;
		s = (u32 *) p->o_arg.u.verifier.data;
		s[0] = jiffies;
		s[1] = current->pid;
		}
		} else if (flags & O_CREAT) {
		p->o_arg.u.attrs = &p->attrs;
		memcpy(&p->attrs, attrs, sizeof(p->attrs));
		}
		p->c_arg.fh = &p->o_res.fh;
		p->c_arg.stateid = &p->o_res.stateid;
		p->c_arg.seqid = p->o_arg.seqid;

+4 −2

Original line number	Diff line number	Diff line
		@@ -196,8 +196,10 @@ struct nfs_openargs {
		__u64 clientid;
		__u64 id;
		union {
		struct {
		struct iattr * attrs; /* UNCHECKED, GUARDED */
		nfs4_verifier verifier; /* EXCLUSIVE */
		};
		nfs4_stateid delegation; /* CLAIM_DELEGATE_CUR */
		fmode_t delegation_type; /* CLAIM_PREVIOUS */
		} u;