3 files changed, 18 insertions, 3 deletions

diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index 716cbff24450..34852ece4057 100644
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -181,9 +181,19 @@ static u32 initiate_file_draining(struct nfs_client *clp,
         pnfs_layoutcommit_inode(ino, false);
 
         spin_lock(&ino->i_lock);
-        if (test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags) ||
-            pnfs_mark_matching_lsegs_invalid(lo, &free_me_list,
+        /*
+         * Enforce RFC5661 Section 12.5.5.2.1.5 (Bulk Recall and Return)
+         */
+        if (test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags)) {
+                rv = NFS4ERR_DELAY;
+                goto unlock;
+        }
+
+        if (pnfs_mark_matching_lsegs_invalid(lo, &free_me_list,
                                         &args->cbl_range)) {
+                pnfs_mark_matching_lsegs_return(lo,
+                                &free_me_list,
+                                &args->cbl_range);
                 rv = NFS4ERR_DELAY;
                 goto unlock;
         }
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index b3fb6bb02275..360fe95c97b5 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1756,7 +1756,7 @@ out_forget_reply:
         goto out;
 }
 
-static void
+void
 pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo,
                                 struct list_head *tmp_list,
                                 struct pnfs_layout_range *return_range)
@@ -1768,6 +1768,8 @@ pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo,
         if (list_empty(&lo->plh_segs))
                 return;
 
+        assert_spin_locked(&lo->plh_inode->i_lock);
+
         list_for_each_entry_safe(lseg, next, &lo->plh_segs, pls_list)
                 if (should_free_lseg(&lseg->pls_range, return_range)) {
                         dprintk("%s: marking lseg %p iomode %d "
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index be24a759b655..d93c2ebc0fd3 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -266,6 +266,9 @@ int pnfs_choose_layoutget_stateid(nfs4_stateid *dst,
 int pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,
                                 struct list_head *tmp_list,
                                 struct pnfs_layout_range *recall_range);
+void pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo,
+                                struct list_head *tmp_list,
+                                struct pnfs_layout_range *recall_range);
 bool pnfs_roc(struct inode *ino);
 void pnfs_roc_release(struct inode *ino);
 void pnfs_roc_set_barrier(struct inode *ino, u32 barrier);