Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d7cf8dd01289b3c64057e38d34c2857f6633d52c

Authored by Trond Myklebust
1 parent a8ce4a8f37
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

NFSv4: Allow attribute caching with 'noac' mounts if client holds a delegation 

If the server has given us a delegation on a file, we _know_ that we can
cache the attribute information even when the user has specified 'noac'.

Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

Showing 2 changed files with 18 additions and 9 deletions Side-by-side Diff

... ... @@ -161,14 +161,17 @@
161 161 struct nfs_server *server = NFS_SERVER(inode);
162 162 struct nfs_inode *nfsi = NFS_I(inode);
163 163  
164   - if (server->flags & NFS_MOUNT_NOAC)
165   - goto force_reval;
  164 + if (nfs_have_delegated_attributes(inode))
  165 + goto out_noreval;
  166 +
166 167 if (filp->f_flags & O_DIRECT)
167 168 goto force_reval;
168   - if (nfsi->npages != 0)
169   - return 0;
170   - if (!(nfsi->cache_validity & NFS_INO_REVAL_PAGECACHE) && !nfs_attribute_timeout(inode))
171   - return 0;
  169 + if (nfsi->cache_validity & NFS_INO_REVAL_PAGECACHE)
  170 + goto force_reval;
  171 + if (nfs_attribute_timeout(inode))
  172 + goto force_reval;
  173 +out_noreval:
  174 + return 0;
172 175 force_reval:
173 176 return __nfs_revalidate_inode(server, inode);
174 177 }
... ... @@ -742,9 +742,14 @@
742 742 {
743 743 struct nfs_inode *nfsi = NFS_I(inode);
744 744  
  745 + return !time_in_range_open(jiffies, nfsi->read_cache_jiffies, nfsi->read_cache_jiffies + nfsi->attrtimeo);
  746 +}
  747 +
  748 +static int nfs_attribute_cache_expired(struct inode *inode)
  749 +{
745 750 if (nfs_have_delegated_attributes(inode))
746 751 return 0;
747   - return !time_in_range_open(jiffies, nfsi->read_cache_jiffies, nfsi->read_cache_jiffies + nfsi->attrtimeo);
  752 + return nfs_attribute_timeout(inode);
748 753 }
749 754  
750 755 /**
... ... @@ -757,7 +762,7 @@
757 762 int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
758 763 {
759 764 if (!(NFS_I(inode)->cache_validity & NFS_INO_INVALID_ATTR)
760   - && !nfs_attribute_timeout(inode))
  765 + && !nfs_attribute_cache_expired(inode))
761 766 return NFS_STALE(inode) ? -ESTALE : 0;
762 767 return __nfs_revalidate_inode(server, inode);
763 768 }
... ... @@ -794,7 +799,8 @@
794 799 int ret = 0;
795 800  
796 801 if ((nfsi->cache_validity & NFS_INO_REVAL_PAGECACHE)
797   - || nfs_attribute_timeout(inode) || NFS_STALE(inode)) {
  802 + || nfs_attribute_cache_expired(inode)
  803 + || NFS_STALE(inode)) {
798 804 ret = __nfs_revalidate_inode(NFS_SERVER(inode), inode);
799 805 if (ret < 0)
800 806 goto out;