From: Li Zefan <lizf@cn.fujitsu.com>
To: Jan Schmidt <list.btrfs@jan-o-sch.net>
Cc: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>
Subject: Re: [PATCH] Btrfs: allow cloning ranges within the same file
Date: Wed, 01 Feb 2012 17:34:21 +0800 [thread overview]
Message-ID: <4F29071D.7020609@cn.fujitsu.com> (raw)
In-Reply-To: <4F26693F.2010705@jan-o-sch.net>
>> It's safe and easy to do so, provided the ranges don't overlap.
>>
>> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
>> ---
>> fs/btrfs/ioctl.c | 23 ++++++++++++++++-------
>> 1 files changed, 16 insertions(+), 7 deletions(-)
>>
>> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
>> index 0b06a5c..8fcd671 100644
>> --- a/fs/btrfs/ioctl.c
>> +++ b/fs/btrfs/ioctl.c
>> @@ -2223,8 +2223,6 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
>> * decompress into destination's address_space (the file offset
>> * may change, so source mapping won't do), then recompress (or
>> * otherwise reinsert) a subrange.
>> - * - allow ranges within the same file to be cloned (provided
>> - * they don't overlap)?
>> */
>>
>> /* the destination must be opened for writing */
>> @@ -2247,8 +2245,6 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
>> src = src_file->f_dentry->d_inode;
>>
>> ret = -EINVAL;
>> - if (src == inode)
>> - goto out_fput;
>>
>> /* the src must be open for reading */
>> if (!(src_file->f_mode & FMODE_READ))
>> @@ -2282,9 +2278,11 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
>> if (inode < src) {
>> mutex_lock_nested(&inode->i_mutex, I_MUTEX_PARENT);
>> mutex_lock_nested(&src->i_mutex, I_MUTEX_CHILD);
>> - } else {
>> + } else if (inode > src) {
>> mutex_lock_nested(&src->i_mutex, I_MUTEX_PARENT);
>> mutex_lock_nested(&inode->i_mutex, I_MUTEX_CHILD);
>> + } else {
>> + mutex_lock(&inode->i_mutex);
>> }
>>
>> /* determine range to clone */
>> @@ -2302,6 +2300,13 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
>> !IS_ALIGNED(destoff, bs))
>> goto out_unlock;
>>
>> + /*
>> + * allow ranges within the same file to be cloned only if
>> + * they don't overlap
>> + */
>> + if (src == inode && !(off + len <= destoff || destoff + len <= off))
> ^^^^^^^^^^^^
> ... this check isn't sufficient. Two different inodes can reference the
> same data extent and we must prevent overlap cloning there as well.
>
Could you be more elaborate on this? I don't know what's the problem
you're refering to.
next prev parent reply other threads:[~2012-02-01 9:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-30 9:14 [PATCH] Btrfs: allow cloning ranges within the same file Li Zefan
2012-01-30 9:56 ` Jan Schmidt
2012-02-01 9:34 ` Li Zefan [this message]
2012-02-02 21:07 ` Jan Schmidt
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=4F29071D.7020609@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=list.btrfs@jan-o-sch.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).