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

Commit 2e84611b authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix an rcu lock leak 



The intention in the original patch was to release the lock when
we put the inode, however something got screwed up.

Reported-by: default avatarJason Yan <yanaijie@huawei.com>
Fixes: 7b410d9c ("pNFS: Delay getting the layout header in..")
Cc: stable@vger.kernel.org # v4.10+
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 0795bf83

fs/nfs/callback_proc.c

+4 −2
Original line number Diff line number Diff line
@@ -131,10 +131,11 @@ static struct inode *nfs_layout_find_inode_by_stateid(struct nfs_client *clp, 
			if (!inode)

				continue;

			if (!nfs_sb_active(inode->i_sb)) {

				rcu_read_lock();

				rcu_read_unlock();

				spin_unlock(&clp->cl_lock);

				iput(inode);

				spin_lock(&clp->cl_lock);

				rcu_read_lock();

				goto restart;

			}

			return inode;
@@ -170,10 +171,11 @@ static struct inode *nfs_layout_find_inode_by_fh(struct nfs_client *clp, 
			if (!inode)

				continue;

			if (!nfs_sb_active(inode->i_sb)) {

				rcu_read_lock();

				rcu_read_unlock();

				spin_unlock(&clp->cl_lock);

				iput(inode);

				spin_lock(&clp->cl_lock);

				rcu_read_lock();

				goto restart;

			}

			return inode;