pnfs: do not need to clear NFS_LAYOUT_BULK_RECALL flag

We do not need to clear the NFS_LAYOUT_BULK_RECALL, as setting it
guarantees that NFS_LAYOUT_DESTROYED will be set once any outstanding
io is finished.

Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index c8d9b2148cb15f5f0001ec4c480c77c0320553d1..c17edfbbaebf8c479597c1d24e4e977c91a75017 100644 (file)
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -254,7 +254,6 @@ put_lseg_locked(struct pnfs_layout_segment *lseg,
                        /* List does not take a reference, so no need for put here */
                        list_del_init(&lseg->pls_layout->plh_layouts);
                        spin_unlock(&clp->cl_lock);
-                       clear_bit(NFS_LAYOUT_BULK_RECALL, &lseg->pls_layout->plh_flags);
                        set_bit(NFS_LAYOUT_DESTROYED, &lseg->pls_layout->plh_flags);
                        /* Matched by initial refcount set in alloc_init_layout_hdr */
                        put_layout_hdr_locked(lseg->pls_layout);
@@ -754,7 +753,6 @@ pnfs_update_layout(struct inode *ino,
                        spin_lock(&clp->cl_lock);
                        list_del_init(&lo->plh_layouts);
                        spin_unlock(&clp->cl_lock);
-                       clear_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags);
                }
                spin_unlock(&ino->i_lock);
        }