Darkangeel_hd
/
lineage_android_kernel_xiaomi_sdm845
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_xiaomi_sdm845.git
1
0
Fork 0
Code Issues Releases Wiki Activity

NFS client bugfixes for 3.11 

- Fix a regression against NFSv4 FreeBSD servers when creating a new file
 - Fix another regression in rpc_client_register()
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.13 (GNU/Linux)
 
 iQIcBAABAgAGBQJR6ZKMAAoJEGcL54qWCgDyQX8P/19LKLNKcL+y2zVGjLbXMTq0
 TpyWdBO0ux7QcqnPEDg+Jpvu62IowYiKTtaSOXtHb5BNjQMBo2RKw3B0eMBoCp/z
 6gHmQRD2hMgqwBxBwHceV+dNwueCUiZW7GqaaNh6/3bpGQefegdONnLEifuPogEu
 oZmEuiVrGDfITEF7D4k5+shXCQN4eNH0LFuIQo4XXdCqmK6PwvOsidZ7YwHVC3Mg
 /Jzda2YsCxHj8kPi1xb9skPPAn6g4kdfYfyr/xSY7IviPixrkg/nEEK1b8xHU81e
 a0dd0Yx5kq6fR8LsBvQCHdj2m7doHM15jf5Np5G7VnnaWEjB2y+QftkxWc9lCNU3
 t2fr9YVD7ZG/GGNSFePHAHmBY0OqDB1Htp4vcwEQfzX6CAR3Hel82WVvut62Z6m4
 G5qHjwdqUFhmRN//SWlDpEqSn+pbeCvPhQS60ayN0TLivRsscm/I4yA75odAnn9b
 4su1IcUpqeJGeV6yDyMUqbx4kYZFyCZg/DNkThXiTKOs47A7ogSS9ev2fTB/V+jd
 rroNHNd/U508ze9D6D4ai9vR78uUp4wKNSSBZMCkBtNh0uSApOTgyGVhertB1EKS
 vgAr4T1tc+9t+0qg1Sb+hbKyBM/KaS5zUrPn+APHPoBXPh5PSVBzeNJkpxHRw/V0
 ZxkEgSQKLZSXYb5ab770
 =XE+7
 -----END PGP SIGNATURE-----

Merge tag 'nfs-for-3.11-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfixes from Trond Myklebust:
 - Fix a regression against NFSv4 FreeBSD servers when creating a new
   file
 - Fix another regression in rpc_client_register()

* tag 'nfs-for-3.11-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4: Fix a regression against the FreeBSD server
  SUNRPC: Fix another issue with rpc_client_register()
This commit is contained in:
Linus Torvalds 2013-07-20 10:48:24 -07:00
parent 90290c4ebe b4a2cf76ab
commit 3be542d464
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/nfs/nfs4xdr.c
View File

@ -999,6 +999,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap,
__be32 *p; __be32 *p;
__be32 *q; __be32 *q;
int len; int len;
uint32_t bmval_len = 2;
uint32_t bmval0 = 0; uint32_t bmval0 = 0;
uint32_t bmval1 = 0; uint32_t bmval1 = 0;
uint32_t bmval2 = 0; uint32_t bmval2 = 0;
@ -1010,7 +1011,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap,
* = 40 bytes, plus any contribution from variable-length fields * = 40 bytes, plus any contribution from variable-length fields
* such as owner/group. * such as owner/group.
*/ */
len = 20; len = 8;
/* Sigh */ /* Sigh */
if (iap->ia_valid & ATTR_SIZE) if (iap->ia_valid & ATTR_SIZE)
@ -1040,8 +1041,6 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap,
} }
len += 4 + (XDR_QUADLEN(owner_grouplen) << 2); len += 4 + (XDR_QUADLEN(owner_grouplen) << 2);
} }
if (label)
len += 4 + 4 + 4 + (XDR_QUADLEN(label->len) << 2);
if (iap->ia_valid & ATTR_ATIME_SET) if (iap->ia_valid & ATTR_ATIME_SET)
len += 16; len += 16;
else if (iap->ia_valid & ATTR_ATIME) else if (iap->ia_valid & ATTR_ATIME)
@ -1050,15 +1049,22 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap,
len += 16; len += 16;
else if (iap->ia_valid & ATTR_MTIME) else if (iap->ia_valid & ATTR_MTIME)
len += 4; len += 4;
if (label) {
len += 4 + 4 + 4 + (XDR_QUADLEN(label->len) << 2);
bmval_len = 3;
}
len += bmval_len << 2;
p = reserve_space(xdr, len); p = reserve_space(xdr, len);
/* /*
* We write the bitmap length now, but leave the bitmap and the attribute * We write the bitmap length now, but leave the bitmap and the attribute
* buffer length to be backfilled at the end of this routine. * buffer length to be backfilled at the end of this routine.
*/ */
*p++ = cpu_to_be32(3); *p++ = cpu_to_be32(bmval_len);
q = p; q = p;
p += 4; /* Skip bitmap entries + attrlen */
p += bmval_len + 1;
if (iap->ia_valid & ATTR_SIZE) { if (iap->ia_valid & ATTR_SIZE) {
bmval0 |= FATTR4_WORD0_SIZE; bmval0 |= FATTR4_WORD0_SIZE;
@ -1112,10 +1118,11 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap,
len, ((char *)p - (char *)q) + 4); len, ((char *)p - (char *)q) + 4);
BUG(); BUG();
} }
len = (char *)p - (char *)q - 16; len = (char *)p - (char *)q - (bmval_len << 2);
*q++ = htonl(bmval0); *q++ = htonl(bmval0);
*q++ = htonl(bmval1); *q++ = htonl(bmval1);
*q++ = htonl(bmval2); if (bmval_len == 3)
*q++ = htonl(bmval2);
*q = htonl(len); *q = htonl(len);
/* out: */ /* out: */

1
net/sunrpc/clnt.c
View File

@ -309,6 +309,7 @@ static int rpc_client_register(const struct rpc_create_args *args,
return 0; return 0;
err_auth: err_auth:
pipefs_sb = rpc_get_sb_net(net); pipefs_sb = rpc_get_sb_net(net);
rpc_unregister_client(clnt);
__rpc_clnt_remove_pipedir(clnt); __rpc_clnt_remove_pipedir(clnt);
out: out:
if (pipefs_sb) if (pipefs_sb)