From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ISfLnGdR" Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DCA6107; Mon, 4 Dec 2023 12:16:29 -0800 (PST) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-50bfd3a5b54so1221579e87.3; Mon, 04 Dec 2023 12:16:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701720987; x=1702325787; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Rxnz7PaULk+xJC6024GR3t6cngdVEej7qz+5rlPj9m8=; b=ISfLnGdRJZDZx1DxneKeXnIxWZvrkJlBu8EIeHeqs5JrisJUxsuAMv7/HbzirDTEmy 7Xm2Sx1wJo7Za41SZYZ/NnXgDrVT8TeJD6i10c+XNX3dx0MaMLJaJJZlaQEDA/WtVZwg unT8yWF6whAhMXu44yMil5qCTEefXucrzSB1d1nq0Nq3OxqmzuaW9yDwWVZO+hQgwyoC 1v0b/kcqKGRiAydqwxc62njQNNzZgmgujBAvDNfEPRN2bPdQctG4wTRC1GFGMS6KGPJd y/GL79dl1eicSXwGnNGsdYcqbk0OK3vDMaqSqguH3aHf+R7WPSueCNBYpQYrYMz8scQb W2DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701720987; x=1702325787; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Rxnz7PaULk+xJC6024GR3t6cngdVEej7qz+5rlPj9m8=; b=mxtjHV8zOTZefeKGW4djeuYf5sD4XypKO3coYZ+PJxdv19Jp4atU2RaU5lqSTTl+yR NkHC5gweBpHtLRUFcGXG6iV/bSY8R6MTToBIOWAMwk67UbG3i6Ifl+tijiI9GREJJoAR bjpIO08t1CybBDb+sLaRfDgOb8LVKbwoow3Fw9M6E29KTdSPTOEpBbASRS5KhZxST8iB N/RUokuxZkrZPOBuIZt3hVEJluPaEI2oCXVKHKvVhpT5JYVeJ1DhiTQdV7B2GkVvEQJb pYzm9pzobyIhkjS8U8SHlLi3Q7ZnglYmzZDeAEeY3VnoePIfvRiYDtClczPqxR8iO4MA DCLg== X-Gm-Message-State: AOJu0YwAdE4kaT6ogdR7LixZvfxbncLE+j7NvfdZiut6/FrV36Ay4XPE gLIluF/nCFo8a9x1n14BVGQgveUHZU+8uQlsUBo= X-Google-Smtp-Source: AGHT+IFFS/LxkhcJWraSuR+9Wwuyd5MEmhcy+jjsGk3cixWkemQBCHl/a25uxzZBP/ANio2oh1Ic/iD5UrKJJHPb+ho= X-Received: by 2002:a05:6512:3c9c:b0:50b:f0f2:6cbb with SMTP id h28-20020a0565123c9c00b0050bf0f26cbbmr2056549lfv.60.1701720987006; Mon, 04 Dec 2023 12:16:27 -0800 (PST) Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <250053.1701698519@warthog.procyon.org.uk> In-Reply-To: <250053.1701698519@warthog.procyon.org.uk> From: Steve French Date: Mon, 4 Dec 2023 14:16:15 -0600 Message-ID: Subject: Re: [PATCH] cifs: Fix non-availability of dedup breaking generic/304 To: David Howells Cc: Steve French , Dave Chinner , Xiaoli Feng , Shyam Prasad N , Rohith Surabattula , Jeff Layton , Darrick Wong , fstests@vger.kernel.org, linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable added missing Signed-off-by line (and also for the two previous patches from David) and added Cc: stable and tentatively merged into cifs-2.6.git for-next pending additional testing On Mon, Dec 4, 2023 at 8:02=E2=80=AFAM David Howells = wrote: > > Deduplication isn't supported on cifs, but cifs doesn't reject it, instea= d > treating it as extent duplication/cloning. This can cause generic/304 to= go > silly and run for hours on end. > > Fix cifs to indicate EOPNOTSUPP if REMAP_FILE_DEDUP is set in > ->remap_file_range(). > > Note that it's unclear whether or not commit b073a08016a1 is meant to cau= se > cifs to return an error if REMAP_FILE_DEDUP. > > Fixes: b073a08016a1 ("cifs: fix that return -EINVAL when do dedupe operat= ion") > Suggested-by: Dave Chinner > cc: Steve French > cc: Xiaoli Feng > cc: Shyam Prasad N > cc: Rohith Surabattula > cc: Jeff Layton > cc: Darrick Wong > cc: fstests@vger.kernel.org > cc: linux-cifs@vger.kernel.org > cc: linux-fsdevel@vger.kernel.org > Link: https://lore.kernel.org/r/3876191.1701555260@warthog.procyon.org.uk= / > --- > fs/smb/client/cifsfs.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c > index 4d8927b57776..96a65cf9b5ec 100644 > --- a/fs/smb/client/cifsfs.c > +++ b/fs/smb/client/cifsfs.c > @@ -1276,7 +1276,9 @@ static loff_t cifs_remap_file_range(struct file *sr= c_file, loff_t off, > unsigned int xid; > int rc; > > - if (remap_flags & ~(REMAP_FILE_DEDUP | REMAP_FILE_ADVISORY)) > + if (remap_flags & REMAP_FILE_DEDUP) > + return -EOPNOTSUPP; > + if (remap_flags & ~REMAP_FILE_ADVISORY) > return -EINVAL; > > cifs_dbg(FYI, "clone range\n"); > > --=20 Thanks, Steve