Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee284e35 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS: Fix race in pnfs_wait_on_layoutreturn 



We must put the task to sleep while holding the inode->i_lock in order
to ensure atomicity with the test for NFS_LAYOUT_RETURN.

Fixes: 500d701f ("NFS41: make close wait for layoutreturn")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 6604b203

fs/nfs/pnfs.c

+3 −5
Original line number Diff line number Diff line
@@ -1257,13 +1257,11 @@ bool pnfs_wait_on_layoutreturn(struct inode *ino, struct rpc_task *task) 
	 * i_lock */

        spin_lock(&ino->i_lock);

        lo = nfsi->layout;

        if (lo && test_bit(NFS_LAYOUT_RETURN, &lo->plh_flags))

        if (lo && test_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) {

                rpc_sleep_on(&NFS_SERVER(ino)->roc_rpcwaitq, task, NULL);

                sleep = true;

	}

        spin_unlock(&ino->i_lock);



        if (sleep)

                rpc_sleep_on(&NFS_SERVER(ino)->roc_rpcwaitq, task, NULL);



        return sleep;

}