From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 468892ECD3A for ; Sat, 6 Jun 2026 06:12:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780726359; cv=none; b=fzMrI3zeFNtSNfhFgM57PUQEmdxttoqIh1sMbEzdZI+mjpAO117OO16m/Zox9UAjnd+q/oFUkFKNfQAamv8vdIe9g1DdSGziRbP5lyhJN7RiLu/SnDF2S1L6lUG33x5BkYdoWBzrTA48x/GmPYZnEwORN6DhGnFEInOJpWvUVmE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780726359; c=relaxed/simple; bh=qZiu7fS8kCZwF8htRjH//VRi7MyCn+kxzvosWiYjiV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=opDhOHHDz/Fb6/QxbMW0kpo0lsktgoW4AffFBzZcpAnM0x3gnHVPXHXXRRZtRZGa34ZdLKP/wQpnYZm7cUek4t6A7qx7HFxv4c1RFv8kMm1KL2QxI9Y0OqtMC1zbR/ujWbtCGSbZVhbR4El3kyZ7WdAQv3GZid1LAgGhmcHtj0c= 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=L4s7ECxT; arc=none smtp.client-ip=209.85.221.49 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="L4s7ECxT" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-45ef189aa1cso1834109f8f.0 for ; Fri, 05 Jun 2026 23:12:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780726357; x=1781331157; 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=L4s7ECxTUjG0RDR3WRK3BqiiobD46Pe2PuXxbGIjV7aQ7oZjPFdSWw9K+z8QGFl9vd ooopF3muoWuT8/+JvGAAQly7+qEYOjvnyirFepJ1O+L2ozkOox3jTYsaWlX59Cm6Jr+b uF69w7fjnJcEPFFSves52eqvnSji2yx1Pq034qcRi8pn0wMhVyR/EhwYyNfkK3pBxhTt xfLpYL4v01Nd/smdKvYZalHR7hMy9sYdamMYZWsRDyep9SNVzk8zm6qofTd4BYKWOD4c EifQHVjNsQG69TrCjxXzvUjJv6LIP5jJTtEfOki8rmwwFw3R1r9qpLpFePMbdgy3P4Uq KEMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780726357; x=1781331157; 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=lHnEnua9Ah4nnrKbUECyqO18VNE+6tLpZONu+6jt5wcF0tRn2XsyUlNl4Mv6epHRTl 2kaLiosb09avK/xqmibCY8vV05RcLRZagdDdca3Az90wVOmQpiWAycsDP/vtAFPuZM4J 7NpWYcEy+cfwaqYuZTPGKRWoy3u9opicmthnrHSLhXFWz8MTi2lkrWxBsD+52TFxOYMz g6QYfRJpxfYi/dmdv4LW0UskRGlZrPdYP9MFiC5zVaxUbVsMfIo4JaXmNAPKeuROLeD7 /uGqTwk+lp2Mqg1g9DPNtiuDUe4Mt/QLCHt4njDYmaIdp75q1rlQCy/bR1TNsdgeDyym 2boA== X-Forwarded-Encrypted: i=1; AFNElJ8/S2eIMJ3DP4uRf8d5lzDx3PW8IbmwSEwSBuFrTv5MSCCHdDITQwNKXqLK8m1n10L22Ep87rc=@vger.kernel.org X-Gm-Message-State: AOJu0Yxr+g4YLXlvQ08MzXSsGThEj9kL/0SH8u/KAAS4mfIyzEqg3tMK mg4dCJEG8+xSvS2NQDO5iVK3GtpCUgFkLUJQjr+kl5Ql4NELZVqg2Qs9 X-Gm-Gg: Acq92OEFV/9cmFQ5yGFxpznH1+8y7skr3uwxhvZpyqmaY6JUZU/gLs5EXXpx2MF1lCQ c+sBYpZUyv0l2RNSPmsacV9BBRRC/uJJQ7lpUKaDKN9SiXKO+kPz68Wt0l+2aia+kvaJLi8Rtuj 3g4NtynPYlSZ7NSXozlYpV5JasZntSS0O0cIgNa+8qDfnUQG3pPSEdcJPr1mvgnXMrDeygMYeUG e0Qvf6Jfy0uJr8tCBH/3O2mgsJ4FY8OWOq26nn3INuo+ceQKjaKk6Grhs4SzxB58cSPRdGCLGOo CSwRjgmRuCOpMWpu+lSAjPRltv+0K/n5MgOI5Az7w8PzbANoaF0yCkyXxUng7hqcX6Ti98CNara ZQxwQpLJHe1JQnLYTk7nSBL/3rtiPV86pbbBd8JR/OYMRALVg+LKZ3VYLwMX5COuO0lZeJcM1kD nBkjbG4GGlu2NXQkU/27vA62laJBlo/A== X-Received: by 2002:adf:e545:0:b0:45e:e44b:3136 with SMTP id ffacd0b85a97d-4603063a715mr8180799f8f.19.1780726356710; Fri, 05 Jun 2026 23:12:36 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-4601f344541sm29667978f8f.22.2026.06.05.23.12.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Jun 2026 23:12:36 -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, ltp@lists.linux.it, 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 , Steven Rostedt , The 8472 , Willy Tarreau , Joanne Koong , patches@lists.linux.dev Subject: [PATCH 4/5] pipe: move wait_for_space to fs/pipe.c and rename it Date: Sat, 6 Jun 2026 06:10:30 +0000 Message-ID: <20260606061031.3744880-5-safinaskar@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260606061031.3744880-1-safinaskar@gmail.com> References: <20260606061031.3744880-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