aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4xdr.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-08-31 15:16:11 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-09-01 20:00:17 -0400
commita06b1261bdb580b35967d0e055d1ab131b332254 (patch)
tree7ce3f00974741f29dcb815f427c242fe3384ca62 /fs/nfsd/nfs4xdr.c
parent468de9e54a900559b55aa939a4daeaea1915e572 (diff)
NFSD: Fix a bug in the NFSv4 'supported attrs' mandatory attribute
The fact that the filesystem doesn't currently list any alternate locations does _not_ imply that the fs_locations attribute should be marked as "unsupported". Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
-rw-r--r--fs/nfsd/nfs4xdr.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index fdf632bf1cfe..20c5e3db0660 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1793,11 +1793,6 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
1793 goto out_nfserr; 1793 goto out_nfserr;
1794 } 1794 }
1795 } 1795 }
1796 if (bmval0 & FATTR4_WORD0_FS_LOCATIONS) {
1797 if (exp->ex_fslocs.locations == NULL) {
1798 bmval0 &= ~FATTR4_WORD0_FS_LOCATIONS;
1799 }
1800 }
1801 if ((buflen -= 16) < 0) 1796 if ((buflen -= 16) < 0)
1802 goto out_resource; 1797 goto out_resource;
1803 1798
@@ -1825,8 +1820,6 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
1825 goto out_resource; 1820 goto out_resource;
1826 if (!aclsupport) 1821 if (!aclsupport)
1827 word0 &= ~FATTR4_WORD0_ACL; 1822 word0 &= ~FATTR4_WORD0_ACL;
1828 if (!exp->ex_fslocs.locations)
1829 word0 &= ~FATTR4_WORD0_FS_LOCATIONS;
1830 if (!word2) { 1823 if (!word2) {
1831 WRITE32(2); 1824 WRITE32(2);
1832 WRITE32(word0); 1825 WRITE32(word0);