9p: don't leave a half-initialized inode sitting around

Al Viro · Al Viro · commit 0a73d0a204a4 · 2015-07-12T11:22:05.000-04:00
Cc: stable@vger.kernel.org # all branches
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
@@ -540,8 +540,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb,
 	unlock_new_inode(inode);
 	return inode;
 error:
-	unlock_new_inode(inode);
-	iput(inode);
+	iget_failed(inode);
 	return ERR_PTR(retval);
 
 }
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
@@ -149,8 +149,7 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb,
 	unlock_new_inode(inode);
 	return inode;
 error:
-	unlock_new_inode(inode);
-	iput(inode);
+	iget_failed(inode);
 	return ERR_PTR(retval);
 
 }

Original file line number	Diff line number	Diff line change
`@@ -540,8 +540,7 @@ static struct inode v9fs_qid_iget(struct super_block sb,`
`540`	`540`	`unlock_new_inode(inode);`
`541`	`541`	`return inode;`
`542`	`542`	`error:`
`543`		`- unlock_new_inode(inode);`
`544`		`- iput(inode);`
	`543`	`+ iget_failed(inode);`
`545`	`544`	`return ERR_PTR(retval);`
`546`	`545`
`547`	`546`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,7 @@ static struct inode v9fs_qid_iget_dotl(struct super_block sb,`
`149`	`149`	`unlock_new_inode(inode);`
`150`	`150`	`return inode;`
`151`	`151`	`error:`
`152`		`- unlock_new_inode(inode);`
`153`		`- iput(inode);`
	`152`	`+ iget_failed(inode);`
`154`	`153`	`return ERR_PTR(retval);`
`155`	`154`
`156`	`155`	`}`