From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03F0D3769EC for ; Thu, 25 Jun 2026 08:36:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782376587; cv=none; b=Qq8KTTVwomDZBRUI4CmvPkLWeXyH1TOl8CHbCa/Ty5OKbAa5mvRKfQ2843bX76/RRykF7/UagTN0bqbc99P56l4Mm2IBpUfrCbpDzprqamwV6sMr3IMzYqFKj0nCUmwEOu0EPHQ0uKTOkD1163U5ZZ4NnSijRl9C1zxfuDe/6Z0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782376587; c=relaxed/simple; bh=qZiu7fS8kCZwF8htRjH//VRi7MyCn+kxzvosWiYjiV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eN1qMyXAfoL1gqHCw/i8Eo/fPHN1gFGiO+V8tvt6I3UAbagbYqjf5MgZ0IUNozCGZOLVPS8jJPMaOpESpovxB9wqnBiSi5fDeuR+T2fSZysDCcVTOTgoialmO3Nlileg7GbhUTUzeI+1KhyuBlI3+wzI5q4KWp/3vujhBBEHZnU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JkDvh/3U; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JkDvh/3U" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-49249707788so10115175e9.2 for ; Thu, 25 Jun 2026 01:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782376584; x=1782981384; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VhjLk1CMHsJsOzOKQ1JbfvjErAaIXQv49sV6IFA3w98=; b=JkDvh/3UEJ/KKFD95OenoyJPpGWz0C30rNVG/xSx51ViDMBLykodCQP6LLextigjSb Y+jWkxDP+JbxE9m5wvysc5XRaMS04mdOgooXX+hmgcEA2mMzG1aGFJdXTf3wL8y5GG6y eeMUmObFy2ZxgNbr5ubK4MO+xgsTjL4fnnI/4wHvB+6nKCs+Xj7uWsF2rQyYvauxXFTd 0103O0ryVXNJWWS10mzD3Ly7L5QqOadPrC8aLIwBBIDyNfRYmOdSi7j7Ffb9igpVBFYs kJhL7N1TAZSYiZRFKmz9r1cT++Bz7Rg2MVdnnbDt8fH8n+MIfC5SjvyzhyrVoa7PidLt icEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782376584; x=1782981384; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VhjLk1CMHsJsOzOKQ1JbfvjErAaIXQv49sV6IFA3w98=; b=knjcp7Sz2LCvZcCBTkzqUwJO0j9oM+8+Yc3NxsQnyNW2AS52dbLls0jZLCZlek47eo WJI6Tl+ZpEzoV5eXkCxfktYr7WqP/RSQ3Xb4aKPXey8Tg0FEuu5SMhiteR9wzACTIdrQ 6A+f6/DbowzvrZP5SHmyZ9Ga3fA4AL3phVPHzuXwmnOpXeE8+uzUPDjA5nYPH1qRd1Nm KDjPJlwURJjAwI2izz2a9ieLlZHnBd1IePZmoTz5l8fdFCsBQoYDDT0oBkN6gil/dL85 MugUe+pebc6cDzMYYjsZeM11QDrhCoPIxfdBwe86sZ8x0hLvO4V2hEZAhe8y8LZ3Y2es Os0A== X-Forwarded-Encrypted: i=1; AFNElJ/JMsdkBtemr8cCO98dBPWsgnkyiT9hTfVCRiV12MlY7T50OR8dN7dFmrp/IVbVUTVgR0gCecE=@vger.kernel.org X-Gm-Message-State: AOJu0YxtOChhQbFckEZQayWNUR+yUPGxcaUKIe1hbTAtUvMIBw8O4Efw GjwkHl5KDo4r9FlHuzGegzL+mSNafKdJHm174JvAFbVm0nh9AsrRmIs+ X-Gm-Gg: AfdE7ckNRNXsMK+DhoLXcmWEfpSqBgl0SEogVERgntWKlki/rYiTXOnkxsMMCDdRzcb YfJtbl3WZ+p9UUlHOt46DnZPqnIxTGuzMtNlGysF1sKWh9ZLSRq1and9YhSo8Gar/ujjakaBQAx lD4Shx/5AVf+a7639L/OP0IfKs0D4EgRGSIe5bVLQZQi9nsxUtjCRYGrzJmXppjtG8S2EdnkCUd ZzXKV8qfpZ9YpMCSKiiZ/t7jxbYG0NNGQdM306XOhbMTcfTxyNdUzA1ErmZexq4kkFXIkCQcmTC 7tVUM0GEYyDESvPEaqN/uXgr08G6ZxZy5T4a0aUVTOycFfRbq4pJHq/KbCv/v7y8Kw+aghYr92T Eudhxhn6MXaOst54CwefOPjoD27eTlAHc9ogJs4I2vpPJLjk5qYx5iueeFR/fp5rcy4IjMRbDSz RKyclyK+mS X-Received: by 2002:a05:600c:c4aa:b0:490:b189:212d with SMTP id 5b1f17b1804b1-492668a83dbmr17827635e9.33.1782376584308; Thu, 25 Jun 2026 01:36:24 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-46c2279b85csm13362284f8f.28.2026.06.25.01.36.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Jun 2026 01:36:23 -0700 (PDT) From: Askar Safin To: linux-fsdevel@vger.kernel.org, Christian Brauner , Alexander Viro , Jan Kara Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-api@vger.kernel.org, netdev@vger.kernel.org, fuse-devel@lists.linux.dev, Linus Torvalds , Matthew Wilcox , Jens Axboe , Christoph Hellwig , David Howells , Andrew Morton , David Hildenbrand , Pedro Falcato , Miklos Szeredi , Andy Lutomirski , Collin Funk , David Laight , Stefan Metzmacher , The 8472 , Willy Tarreau , Joanne Koong , Val Packett , Andrei Vagin , patches@lists.linux.dev Subject: [PATCH v2 4/7] pipe: move wait_for_space to fs/pipe.c and rename it Date: Thu, 25 Jun 2026 08:34:06 +0000 Message-ID: <20260625083409.3769242-5-safinaskar@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260625083409.3769242-1-safinaskar@gmail.com> References: <20260625083409.3769242-1-safinaskar@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This is needed, because I plan to use it in fs/read_write.c. Signed-off-by: Askar Safin --- fs/pipe.c | 17 +++++++++++++++++ fs/splice.c | 19 +------------------ include/linux/pipe_fs_i.h | 2 ++ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/fs/pipe.c b/fs/pipe.c index 9841648c9..c0ccf21b9 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -1451,6 +1451,23 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned int arg) return ret; } +int pipe_wait_for_space(struct pipe_inode_info *pipe, bool non_block) +{ + for (;;) { + if (unlikely(!pipe->readers)) { + send_sig(SIGPIPE, current, 0); + return -EPIPE; + } + if (!pipe_is_full(pipe)) + return 0; + if (non_block) + return -EAGAIN; + if (signal_pending(current)) + return -ERESTARTSYS; + pipe_wait_writable(pipe); + } +} + static const struct super_operations pipefs_ops = { .destroy_inode = free_inode_nonrcu, .statfs = simple_statfs, diff --git a/fs/splice.c b/fs/splice.c index 707db2c2c..d12243d19 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1239,23 +1239,6 @@ ssize_t splice_file_range(struct file *in, loff_t *ppos, struct file *out, } EXPORT_SYMBOL(splice_file_range); -static int wait_for_space(struct pipe_inode_info *pipe, bool non_block) -{ - for (;;) { - if (unlikely(!pipe->readers)) { - send_sig(SIGPIPE, current, 0); - return -EPIPE; - } - if (!pipe_is_full(pipe)) - return 0; - if (non_block) - return -EAGAIN; - if (signal_pending(current)) - return -ERESTARTSYS; - pipe_wait_writable(pipe); - } -} - static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe, struct pipe_inode_info *opipe, size_t len, unsigned int flags); @@ -1268,7 +1251,7 @@ ssize_t splice_file_to_pipe(struct file *in, ssize_t ret; pipe_lock(opipe); - ret = wait_for_space(opipe, flags & SPLICE_F_NONBLOCK); + ret = pipe_wait_for_space(opipe, flags & SPLICE_F_NONBLOCK); if (!ret) ret = do_splice_read(in, offset, opipe, len, flags); pipe_unlock(opipe); diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index a1eeed800..be653625d 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h @@ -335,4 +335,6 @@ struct pipe_inode_info *get_pipe_info(struct file *file, bool for_splice); int create_pipe_files(struct file **, int); unsigned int round_pipe_size(unsigned int size); +int pipe_wait_for_space(struct pipe_inode_info *pipe, bool non_block); + #endif -- 2.47.3