From patchwork Sat Mar 22 20:35:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 14026416 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 C2DDF236433 for ; Sat, 22 Mar 2025 20:36:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742675788; cv=none; b=U4kuWR5KvSSXIVcvanUe/LEgQ2p393OkyFZuT6UfQr/ce1Vt99UmlFoVsEVdsu4UGX2/HW51MejrgNednok/EKQHN7TZPx9kRpSOvh4kH1YDuC0fkkh6Hkiu+SD4qs8t31fGJ7Vnb/+seqIZJJTY4I1Cjk28wBVAC4bCwz4G0+c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742675788; c=relaxed/simple; bh=c3/J2vBhFHgcYU8/R+B3kO6gEpk4hnzkVfVtuyfH1MY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L7fzSEX7eHpvl24YISKARa6B7kfKHIxNfSsXDaXjJ9ntoBm6PJL5RhFIVWSZ/c3ZNG9JaBdi5+D+uf4SFvT5h60o4J8CQhHNme3X+jtxJ6+jgeR/zPpjwwbmyYRypO6+CK0O1MoN2XX9cs8yek7W+mBuPgAIiMrVJYYMbGml9Nc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=vYtlnrts; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="vYtlnrts" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2235189adaeso57961425ad.0 for ; Sat, 22 Mar 2025 13:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1742675786; x=1743280586; 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=dz/LHTTUvobHGyp+oeRaoigsjw3nQSx8Yss6Q7WiTEA=; b=vYtlnrtsa70XvUxSH/BwDpwL7WlkEe4pR4Dqcd+CuXXifqtEe04UCyrmSCgFn2MBiE 0xvx0EEJLPsYvBsDDvJ7p2DFfbSC2vsUr0PMxehVIEQbrS0mCf9+ohJ+0kHvjJU/VoKP CSZemS9GPjNvXN1utqyDLFd32AA3/U3MqFj2w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742675786; x=1743280586; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dz/LHTTUvobHGyp+oeRaoigsjw3nQSx8Yss6Q7WiTEA=; b=UmijH/o27meXyIOaZptho35bsJH6BOuisNu3ICD6wBb38huL++8vZCwEcls/1znLPS DksZWSpxvUnbSNTfQYrB1CyROan83CIw6gQOAcK6ZAE6X5FBvPDl3P76+Lc8H3bOKblU cfGy/5MvPZz8yoO25LKanMy87LxZGG4MV9LG+U+hMONxSGCk4u4cnkK7VPNjQjoD3OVP 6mYaU9vY3LqmdlFEw4Tct6dEIyj7fTXUq1N/V2JiZf2Iz5zyAguXJgkWQMuZ1gfdXWyh w50dxmdBXigT9yBw0MItIM25ufszKr/qMw7rtxBXtd+Y0ac67L02LsjY19S+UGQb5Odl GQag== X-Gm-Message-State: AOJu0Yyg0yMiA7qouj556J5Du63Z6a316nqVTABVFl2KpiFAw7WV56X7 QWBiZnQ+NqvmjVj1a9BFkJlpPRdNu1MVN7ntmVHmJVG9QfdezC9CFEp3gOZpk2zh4ocg0bS7Vbv K X-Gm-Gg: ASbGnct2CRkaytSZsqqadQhm4dZdzIalqDbfHymNvDjIGomQD+NxK4VwszZjiBFB0X/ ykwN1N2mX814ZLeWoewCv18Pe7hSNrbXgZ94H1gmbaJfACfmOJVh5Zw3gkgkHOlOJW3XepMmf/5 mgkgD+3jtjY6HghJqT2OVrEM7hVXcuKw75tYKbBT43AJ0kR3YnTkRQcplAnGB3onhnzYp05xxaB FXlUaHUU+dko548sYMZtOD7XnaY1LkD7fyRJaT6/Po/QEynUhh3AqQ5GUesyhIBJTVHYwaOl2zd heh6L2yAm8JXo4SOOMrHE/nLXtMKnGCaZCj5nyDNNzp6WQ2XSDiJooN2GXDp4BY= X-Google-Smtp-Source: AGHT+IFlOF9+hHiNwkeX6ca8/2vV/UbK7oUM8j14EpRf1krcAZwqEjvIIPVQftAfXDqYfTgS2nWJkA== X-Received: by 2002:a17:902:d9d0:b0:21f:6d63:6f4f with SMTP id d9443c01a7336-2265e67fa37mr149203865ad.2.1742675785993; Sat, 22 Mar 2025 13:36:25 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf61a579sm8711798a91.32.2025.03.22.13.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Mar 2025 13:36:25 -0700 (PDT) From: Joe Damato To: linux-fsdevel@vger.kernel.org Cc: netdev@vger.kernel.org, brauner@kernel.org, asml.silence@gmail.com, hch@infradead.org, axboe@kernel.dk, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, Joe Damato , "David S. Miller" , linux-kernel@vger.kernel.org (open list) Subject: [PATCH vfs/for-next 3/3] net: splice_to_socket: RCT declaration cleanup Date: Sat, 22 Mar 2025 20:35:46 +0000 Message-ID: <20250322203558.206411-4-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250322203558.206411-1-jdamato@fastly.com> References: <20250322203558.206411-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Make declarations reverse x-mas tree style now that splice_to_socket lives in net/. Signed-off-by: Joe Damato --- net/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/socket.c b/net/socket.c index 2640b42cf320..b54df75af1a1 100644 --- a/net/socket.c +++ b/net/socket.c @@ -3739,11 +3739,11 @@ static ssize_t splice_to_socket(struct pipe_inode_info *pipe, struct file *out, loff_t *ppos, size_t len, unsigned int flags) { struct socket *sock = sock_from_file(out); + bool need_wakeup = false; struct bio_vec bvec[16]; struct msghdr msg = {}; - ssize_t ret = 0; size_t spliced = 0; - bool need_wakeup = false; + ssize_t ret = 0; pipe_lock(pipe);