From: David Sterba <dsterba@suse.cz>
To: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: linux-fsdevel@vger.kernel.org, ericvh@gmail.com,
lucho@ionkov.net, viro@zeniv.linux.org.uk, jlayton@kernel.org,
idryomov@gmail.com, mark@fasheh.com, jlbec@evilplan.org,
joseph.qi@linux.alibaba.com,
v9fs-developer@lists.sourceforge.net,
linux-kernel@vger.kernel.org, ceph-devel@vger.kernel.org,
ocfs2-devel@oss.oracle.com, linux-btrfs@vger.kernel.org,
clm@fb.com, josef@toxicpanda.com, dsterba@suse.com,
stable@vger.kernel.org
Subject: Re: [PATCH 5/7] btrfs: Promote to unsigned long long before shifting
Date: Mon, 26 Oct 2020 18:02:44 +0100 [thread overview]
Message-ID: <20201026170244.GQ6756@twin.jikos.cz> (raw)
In-Reply-To: <20201004180428.14494-6-willy@infradead.org>
On Sun, Oct 04, 2020 at 07:04:26PM +0100, Matthew Wilcox (Oracle) wrote:
> On 32-bit systems, this shift will overflow for files larger than 4GB.
>
> Cc: stable@vger.kernel.org
> Fixes: df480633b891 ("btrfs: extent-tree: Switch to new delalloc space reserve and release")
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
> fs/btrfs/ioctl.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index ac45f022b495..4d3b7e4ae53a 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -1277,7 +1277,7 @@ static int cluster_pages_for_defrag(struct inode *inode,
> page_cnt = min_t(u64, (u64)num_pages, (u64)file_end - start_index + 1);
>
> ret = btrfs_delalloc_reserve_space(BTRFS_I(inode), &data_reserved,
> - start_index << PAGE_SHIFT,
> + (loff_t)start_index << PAGE_SHIFT,
> - start_index << PAGE_SHIFT,
> + (loff_t)start_index << PAGE_SHIFT,
> - start_index << PAGE_SHIFT,
> + (loff_t)start_index << PAGE_SHIFT,
As this repeats 3 times I've added a variable. Patch added to misc-next,
thanks.
WARNING: multiple messages have this Message-ID (diff)
From: David Sterba <dsterba@suse.cz>
To: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: linux-fsdevel@vger.kernel.org, ericvh@gmail.com,
lucho@ionkov.net, viro@zeniv.linux.org.uk, jlayton@kernel.org,
idryomov@gmail.com, mark@fasheh.com, jlbec@evilplan.org,
joseph.qi@linux.alibaba.com,
v9fs-developer@lists.sourceforge.net,
linux-kernel@vger.kernel.org, ceph-devel@vger.kernel.org,
ocfs2-devel@oss.oracle.com, linux-btrfs@vger.kernel.org,
clm@fb.com, josef@toxicpanda.com, dsterba@suse.com,
stable@vger.kernel.org
Subject: [Ocfs2-devel] [PATCH 5/7] btrfs: Promote to unsigned long long before shifting
Date: Mon, 26 Oct 2020 18:02:44 +0100 [thread overview]
Message-ID: <20201026170244.GQ6756@twin.jikos.cz> (raw)
In-Reply-To: <20201004180428.14494-6-willy@infradead.org>
On Sun, Oct 04, 2020 at 07:04:26PM +0100, Matthew Wilcox (Oracle) wrote:
> On 32-bit systems, this shift will overflow for files larger than 4GB.
>
> Cc: stable at vger.kernel.org
> Fixes: df480633b891 ("btrfs: extent-tree: Switch to new delalloc space reserve and release")
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
> fs/btrfs/ioctl.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index ac45f022b495..4d3b7e4ae53a 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -1277,7 +1277,7 @@ static int cluster_pages_for_defrag(struct inode *inode,
> page_cnt = min_t(u64, (u64)num_pages, (u64)file_end - start_index + 1);
>
> ret = btrfs_delalloc_reserve_space(BTRFS_I(inode), &data_reserved,
> - start_index << PAGE_SHIFT,
> + (loff_t)start_index << PAGE_SHIFT,
> - start_index << PAGE_SHIFT,
> + (loff_t)start_index << PAGE_SHIFT,
> - start_index << PAGE_SHIFT,
> + (loff_t)start_index << PAGE_SHIFT,
As this repeats 3 times I've added a variable. Patch added to misc-next,
thanks.
next prev parent reply other threads:[~2020-10-26 17:05 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-04 18:04 [PATCH 0/7] Fix a pile of 4GB file problems on 32-bit Matthew Wilcox (Oracle)
2020-10-04 18:04 ` [Ocfs2-devel] " Matthew Wilcox
2020-10-04 18:04 ` [PATCH 1/7] 9P: Cast to loff_t before multiplying Matthew Wilcox (Oracle)
2020-10-04 18:04 ` [Ocfs2-devel] " Matthew Wilcox
2020-10-07 5:48 ` Christoph Hellwig
2020-10-07 5:48 ` [Ocfs2-devel] " Christoph Hellwig
2020-10-07 18:47 ` Matthew Wilcox
2020-10-07 18:47 ` [Ocfs2-devel] " Matthew Wilcox
2020-10-26 17:14 ` Dominique Martinet
2020-10-26 17:14 ` [Ocfs2-devel] " Dominique Martinet
2020-10-04 18:04 ` [PATCH 2/7] buffer: Promote to unsigned long long before shifting Matthew Wilcox (Oracle)
2020-10-04 18:04 ` [Ocfs2-devel] " Matthew Wilcox
2020-10-04 18:04 ` [PATCH 3/7] ceph: " Matthew Wilcox (Oracle)
2020-10-04 18:04 ` [Ocfs2-devel] " Matthew Wilcox
2020-10-06 11:29 ` Jeff Layton
2020-10-06 11:29 ` [Ocfs2-devel] " Jeff Layton
2020-10-06 17:20 ` Jeff Layton
2020-10-06 17:20 ` [Ocfs2-devel] " Jeff Layton
2020-10-04 18:04 ` [PATCH 4/7] ocfs2: " Matthew Wilcox (Oracle)
2020-10-04 18:04 ` [Ocfs2-devel] " Matthew Wilcox
2020-10-04 18:04 ` [PATCH 5/7] btrfs: " Matthew Wilcox (Oracle)
2020-10-04 18:04 ` [Ocfs2-devel] " Matthew Wilcox
2020-10-09 14:18 ` Josef Bacik
2020-10-09 14:18 ` [Ocfs2-devel] " Josef Bacik
2020-10-26 17:02 ` David Sterba [this message]
2020-10-26 17:02 ` David Sterba
2020-10-04 18:04 ` [PATCH 6/7] " Matthew Wilcox (Oracle)
2020-10-04 18:04 ` [Ocfs2-devel] " Matthew Wilcox
2020-10-09 14:18 ` Josef Bacik
2020-10-09 14:18 ` [Ocfs2-devel] " Josef Bacik
2020-10-26 16:35 ` David Sterba
2020-10-26 16:35 ` [Ocfs2-devel] " David Sterba
2020-10-26 16:44 ` Matthew Wilcox
2020-10-26 16:44 ` [Ocfs2-devel] " Matthew Wilcox
2020-10-26 17:03 ` David Sterba
2020-10-26 17:03 ` [Ocfs2-devel] " David Sterba
2020-10-04 18:04 ` [PATCH 7/7] btrfs: Promote to unsigned long long before multiplying Matthew Wilcox (Oracle)
2020-10-04 18:04 ` [Ocfs2-devel] " Matthew Wilcox
2020-10-26 16:21 ` David Sterba
2020-10-26 16:21 ` [Ocfs2-devel] " David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201026170244.GQ6756@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=ceph-devel@vger.kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=ericvh@gmail.com \
--cc=idryomov@gmail.com \
--cc=jlayton@kernel.org \
--cc=jlbec@evilplan.org \
--cc=josef@toxicpanda.com \
--cc=joseph.qi@linux.alibaba.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lucho@ionkov.net \
--cc=mark@fasheh.com \
--cc=ocfs2-devel@oss.oracle.com \
--cc=stable@vger.kernel.org \
--cc=v9fs-developer@lists.sourceforge.net \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.