nfsd4: nfsd4_encode_fattr cleanup (6b6d8137) · Commits · e / devices / android_kernel_teracube_2e

fs/nfsd/nfs4xdr.c

+4 −13

Original line number	Diff line number	Diff line
		@@ -2230,8 +2230,10 @@ nfsd4_encode_fattr(struct svc_fh fhp, struct svc_export exp,
		if ((buflen -= 4) < 0)
		goto out_resource;
		dummy = nfs4_file_type(stat.mode);
		if (dummy == NF4BAD)
		goto out_serverfault;
		if (dummy == NF4BAD) {
		status = nfserr_serverfault;
		goto out;
		}
		WRITE32(dummy);
		}
		if (bmval0 & FATTR4_WORD0_FH_EXPIRE_TYPE) {
		@@ -2325,8 +2327,6 @@ nfsd4_encode_fattr(struct svc_fh fhp, struct svc_export exp,
		WRITE32(ace->flag);
		WRITE32(ace->access_mask & NFS4_ACE_MASK_ALL);
		status = nfsd4_encode_aclname(rqstp, ace, &p, &buflen);
		if (status == nfserr_resource)
		goto out_resource;
		if (status)
		goto out;
		}
		@@ -2387,8 +2387,6 @@ nfsd4_encode_fattr(struct svc_fh fhp, struct svc_export exp,
		}
		if (bmval0 & FATTR4_WORD0_FS_LOCATIONS) {
		status = nfsd4_encode_fs_locations(rqstp, exp, &p, &buflen);
		if (status == nfserr_resource)
		goto out_resource;
		if (status)
		goto out;
		}
		@@ -2439,15 +2437,11 @@ nfsd4_encode_fattr(struct svc_fh fhp, struct svc_export exp,
		}
		if (bmval1 & FATTR4_WORD1_OWNER) {
		status = nfsd4_encode_user(rqstp, stat.uid, &p, &buflen);
		if (status == nfserr_resource)
		goto out_resource;
		if (status)
		goto out;
		}
		if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
		status = nfsd4_encode_group(rqstp, stat.gid, &p, &buflen);
		if (status == nfserr_resource)
		goto out_resource;
		if (status)
		goto out;
		}
		@@ -2550,9 +2544,6 @@ nfsd4_encode_fattr(struct svc_fh fhp, struct svc_export exp,
		out_resource:
		status = nfserr_resource;
		goto out;
		out_serverfault:
		status = nfserr_serverfault;
		goto out;
		}

		static inline int attributes_need_mount(u32 *bmval)