Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Wang Yufen <wangyufen@huawei.com>
To:     <dhowells@redhat.com>, <christophe.jaillet@wanadoo.fr>
CC:     <linux-kernel@vger.kernel.org>, Wang Yufen <wangyufen@huawei.com>
Subject: [PATCH] watch_queue: Fix error return code in watch_queue_set_size()
Date:   Thu, 1 Dec 2022 16:07:25 +0800
Message-ID: <1669882045-41842-1-git-send-email-wangyufen@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Fix to return a negative error code -ENOMEM instead of 0.

Fixes: c73be61cede5 ("pipe: Add general notification queue support")
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
---
 kernel/watch_queue.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/kernel/watch_queue.c b/kernel/watch_queue.c
index a6f9bdd..fe6e19c 100644
--- a/kernel/watch_queue.c
+++ b/kernel/watch_queue.c
@@ -274,19 +274,25 @@ long watch_queue_set_size(struct pipe_inode_info *pipe, unsigned int nr_notes)
 		goto error;
 
 	pages = kcalloc(sizeof(struct page *), nr_pages, GFP_KERNEL);
-	if (!pages)
+	if (!pages) {
+		ret = -ENOMEM;
 		goto error;
+	}
 
 	for (i = 0; i < nr_pages; i++) {
 		pages[i] = alloc_page(GFP_KERNEL);
-		if (!pages[i])
+		if (!pages[i]) {
+			ret = -ENOMEM;
 			goto error_p;
+		}
 		pages[i]->index = i * WATCH_QUEUE_NOTES_PER_PAGE;
 	}
 
 	bitmap = bitmap_alloc(nr_notes, GFP_KERNEL);
-	if (!bitmap)
+	if (!bitmap) {
+		ret = -ENOMEM;
 		goto error_p;
+	}
 
 	bitmap_fill(bitmap, nr_notes);
 	wqueue->notes = pages;
-- 
1.8.3.1