linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Amir Goldstein <amir73il@gmail.com>
To: Miklos Szeredi <mszeredi@redhat.com>
Cc: overlayfs <linux-unionfs@vger.kernel.org>,
	linux-fsdevel <linux-fsdevel@vger.kernel.org>,
	linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 03/39] vfs: dedupe: extract helper for a single dedup
Date: Tue, 29 May 2018 19:04:47 +0300	[thread overview]
Message-ID: <CAOQ4uxiUUtLAMxvDg8hMcgqZUV96dLs8stJPgh6w-pj4KGvabw@mail.gmail.com> (raw)
In-Reply-To: <CAOQ4uxi5Y4mF9b9g5a_ggEUWPToKbRUsuzwN4aGjvnQ6itRkUw@mail.gmail.com>

On Tue, May 29, 2018 at 6:41 PM, Amir Goldstein <amir73il@gmail.com> wrote:
> On Tue, May 29, 2018 at 5:43 PM, Miklos Szeredi <mszeredi@redhat.com> wrote:
>> Extract vfs_dedupe_file_range_one() helper to deal with a single dedup
>> request.
>>
>> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
>> ---
>>  fs/read_write.c | 89 +++++++++++++++++++++++++++++++--------------------------
>>  1 file changed, 49 insertions(+), 40 deletions(-)
>>
>> diff --git a/fs/read_write.c b/fs/read_write.c
>> index 1818581cadf6..82a53c44c0aa 100644
>> --- a/fs/read_write.c
>> +++ b/fs/read_write.c
>> @@ -1964,6 +1964,44 @@ int vfs_dedupe_file_range_compare(struct inode *src, loff_t srcoff,
>>  }
>>  EXPORT_SYMBOL(vfs_dedupe_file_range_compare);
>>
>> +static s64 vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos,
>> +                                    struct file *dst_file, loff_t dst_pos,
>> +                                    u64 len)
>> +{
>> +       s64 ret;
>> +
>> +       ret = mnt_want_write_file(dst_file);
>> +       if (ret)
>> +               return ret;
>> +
>> +       ret = clone_verify_area(dst_file, dst_pos, len, true);
>> +       if (ret < 0)
>> +               goto out_drop_write;
>> +
>> +       ret = -EINVAL;
>> +       if (!(capable(CAP_SYS_ADMIN) || (dst_file->f_mode & FMODE_WRITE)))
>> +               goto out_drop_write;
>> +
>> +       ret = -EXDEV;
>> +       if (src_file->f_path.mnt != dst_file->f_path.mnt)
>> +               goto out_drop_write;
>> +
>> +       ret = -EISDIR;
>> +       if (S_ISDIR(file_inode(dst_file)->i_mode))
>> +               goto out_drop_write;
>> +
>> +       ret = -EINVAL;
>> +       if (!dst_file->f_op->dedupe_file_range)
>> +               goto out_drop_write;
>> +
>> +       ret = dst_file->f_op->dedupe_file_range(src_file, src_pos,
>> +                                               dst_file, dst_pos, len);
>> +out_drop_write:
>> +       mnt_drop_write_file(dst_file);
>> +
>> +       return ret;
>> +}
>> +
>>  int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
>>  {
>>         struct file_dedupe_range_info *info;
>> @@ -1972,10 +2010,7 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
>>         u64 len;
>>         int i;
>>         int ret;
>> -       bool is_admin = capable(CAP_SYS_ADMIN);
>>         u16 count = same->dest_count;
>> -       struct file *dst_file;
>> -       loff_t dst_off;
>>         loff_t deduped;
>>
>>         if (!(file->f_mode & FMODE_READ))
>> @@ -2010,54 +2045,28 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
>>         }
>>
>>         for (i = 0, info = same->info; i < count; i++, info++) {
>> -               struct inode *dst;
>>                 struct fd dst_fd = fdget(info->dest_fd);
>> +               struct file *dst_file = dst_fd.file;
>>
>> -               dst_file = dst_fd.file;
>>                 if (!dst_file) {
>>                         info->status = -EBADF;
>>                         goto next_loop;
>>                 }
>> -               dst = file_inode(dst_file);
>> -
>> -               ret = mnt_want_write_file(dst_file);
>> -               if (ret) {
>> -                       info->status = ret;
>> -                       goto next_loop;
>> -               }
>> -
>> -               dst_off = info->dest_offset;
>> -               ret = clone_verify_area(dst_file, dst_off, len, true);
>> -               if (ret < 0) {
>> -                       info->status = ret;
>> -                       goto next_file;
>> -               }
>> -               ret = 0;
>>
>>                 if (info->reserved) {
>>                         info->status = -EINVAL;
>> -               } else if (!(is_admin || (dst_file->f_mode & FMODE_WRITE))) {
>> -                       info->status = -EINVAL;
>> -               } else if (file->f_path.mnt != dst_file->f_path.mnt) {
>> -                       info->status = -EXDEV;
>> -               } else if (S_ISDIR(dst->i_mode)) {
>> -                       info->status = -EISDIR;
>> -               } else if (dst_file->f_op->dedupe_file_range == NULL) {
>> -                       info->status = -EINVAL;
>> -               } else {
>> -                       deduped = dst_file->f_op->dedupe_file_range(file, off,
>> -                                                       dst_file,
>> -                                                       info->dest_offset, len);
>> -                       if (deduped == -EBADE)
>> -                               info->status = FILE_DEDUPE_RANGE_DIFFERS;
>> -                       else if (deduped < 0)
>> -                               info->status = deduped;
>> -                       else
>> -                               info->bytes_deduped += deduped;
>> +                       goto next_loop;
>>                 }
>>
>> -next_file:
>> -               mnt_drop_write_file(dst_file);
>> +               deduped = vfs_dedupe_file_range_one(file, off, dst_file,
>> +                                                   info->dest_offset, len);
>> +               if (deduped == -EBADE)
>> +                       info->status = FILE_DEDUPE_RANGE_DIFFERS;
>> +               else if (deduped < 0)
>> +                       info->status = deduped;
>> +               else
>> +                       info->bytes_deduped += deduped;
>> +
>>  next_loop:
>>                 fdput(dst_fd);
>>
>
> Please note that this patch conflicts with but is also an alternative to commit
> 227627114799 fs: avoid fdput() after failed fdget() in vfs_dedupe_file_range()
> on Al's fixes => for-next branch.
>

Sorry, that's a conflict, and a rather trivial one, but Miklos' patch is not
an alternative fix.

Thanks,
Amir.

  reply	other threads:[~2018-05-29 16:04 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-29 14:43 [PATCH 00/39] overlayfs: stack file operations Miklos Szeredi
2018-05-29 14:43 ` [PATCH 01/39] vfs: dedpue: return loff_t Miklos Szeredi
2018-06-04  8:43   ` Christoph Hellwig
2018-06-05  8:33     ` Miklos Szeredi
2018-06-06 15:09       ` Darrick J. Wong
2018-06-18 20:08         ` Miklos Szeredi
2018-05-29 14:43 ` [PATCH 02/39] vfs: dedupe: rationalize args Miklos Szeredi
2018-06-06 15:02   ` Darrick J. Wong
2018-05-29 14:43 ` [PATCH 03/39] vfs: dedupe: extract helper for a single dedup Miklos Szeredi
2018-05-29 15:41   ` Amir Goldstein
2018-05-29 16:04     ` Amir Goldstein [this message]
2018-06-04  8:44   ` Christoph Hellwig
2018-05-29 14:43 ` [PATCH 04/39] vfs: add path_open() Miklos Szeredi
2018-06-04  8:46   ` Christoph Hellwig
2018-06-10  4:36     ` Al Viro
2018-05-29 14:43 ` [PATCH 05/39] vfs: optionally don't account file in nr_files Miklos Szeredi
2018-06-04  8:47   ` Christoph Hellwig
2018-06-04  8:57     ` Miklos Szeredi
2018-06-10  4:41   ` Al Viro
2018-05-29 14:43 ` [PATCH 06/39] vfs: add f_op->pre_mmap() Miklos Szeredi
2018-06-04  8:48   ` Christoph Hellwig
2018-06-05 11:36     ` Miklos Szeredi
2018-05-29 14:43 ` [PATCH 07/39] vfs: export vfs_ioctl() to modules Miklos Szeredi
2018-06-04  8:49   ` Christoph Hellwig
2018-06-10  4:57     ` Al Viro
2018-06-11  7:19       ` Miklos Szeredi
2018-06-11 16:24         ` Christoph Hellwig
2018-06-19 14:04           ` Miklos Szeredi
2018-06-19 14:24             ` Christoph Hellwig
2018-06-19 14:34               ` Miklos Szeredi
2018-06-19 14:54                 ` Al Viro
2018-05-29 14:43 ` [PATCH 08/39] vfs: export vfs_dedupe_file_range_one() " Miklos Szeredi
2018-05-29 14:43 ` [PATCH 09/39] ovl: copy up times Miklos Szeredi
2018-05-29 14:43 ` [PATCH 10/39] ovl: copy up inode flags Miklos Szeredi
2018-05-29 14:43 ` [PATCH 11/39] Revert "Revert "ovl: get_write_access() in truncate"" Miklos Szeredi
2018-05-29 14:43 ` [PATCH 12/39] ovl: copy up file size as well Miklos Szeredi
2018-05-29 14:43 ` [PATCH 13/39] ovl: deal with overlay files in ovl_d_real() Miklos Szeredi
2018-05-29 14:43 ` [PATCH 14/39] ovl: stack file ops Miklos Szeredi
2018-06-10  4:13   ` Al Viro
2018-06-11  7:09     ` Miklos Szeredi
2018-06-12  2:29       ` Al Viro
2018-06-12  2:40         ` Al Viro
2018-06-12  9:24           ` Miklos Szeredi
2018-06-12 18:24             ` Al Viro
2018-06-12 18:31               ` Al Viro
2018-06-13  9:21                 ` Miklos Szeredi
2018-06-15  5:47                   ` Al Viro
2018-06-18 11:50                     ` Miklos Szeredi
2018-06-13 11:56               ` J. R. Okajima
2018-05-29 14:43 ` [PATCH 15/39] ovl: add helper to return real file Miklos Szeredi
2018-06-10  5:42   ` Al Viro
2018-06-11  8:11     ` Miklos Szeredi
2018-05-29 14:43 ` [PATCH 16/39] ovl: add ovl_read_iter() Miklos Szeredi
2018-05-29 14:43 ` [PATCH 17/39] ovl: add ovl_write_iter() Miklos Szeredi
2018-05-29 14:43 ` [PATCH 18/39] ovl: add ovl_fsync() Miklos Szeredi
2018-05-29 14:43 ` [PATCH 19/39] ovl: add ovl_mmap() Miklos Szeredi
2018-06-10  5:24   ` Al Viro
2018-06-11  7:58     ` Miklos Szeredi
2018-05-29 14:43 ` [PATCH 20/39] ovl: add ovl_fallocate() Miklos Szeredi
2018-05-29 14:43 ` [PATCH 21/39] ovl: add lsattr/chattr support Miklos Szeredi
2018-05-29 14:43 ` [PATCH 22/39] ovl: add ovl_fiemap() Miklos Szeredi
2018-05-29 14:43 ` [PATCH 23/39] ovl: add O_DIRECT support Miklos Szeredi
2018-06-10  5:31   ` Al Viro
2018-06-11  8:08     ` Miklos Szeredi
2018-05-29 14:43 ` [PATCH 24/39] ovl: add reflink/copyfile/dedup support Miklos Szeredi
2018-05-29 14:43 ` [PATCH 25/39] vfs: don't open real Miklos Szeredi
2018-05-29 14:43 ` [PATCH 26/39] ovl: copy-up on MAP_SHARED Miklos Szeredi
2018-05-29 14:43 ` [PATCH 27/39] ovl: obsolete "check_copy_up" module option Miklos Szeredi
2018-05-29 15:13   ` Amir Goldstein
2018-05-30  8:26     ` Miklos Szeredi
2018-05-29 14:43 ` [PATCH 28/39] ovl: fix documentation of non-standard behavior Miklos Szeredi
2018-05-29 14:43 ` [PATCH 29/39] vfs: simplify dentry_open() Miklos Szeredi
2018-05-29 14:43 ` [PATCH 30/39] Revert "ovl: fix may_write_real() for overlayfs directories" Miklos Szeredi
2018-05-29 14:43 ` [PATCH 31/39] Revert "ovl: don't allow writing ioctl on lower layer" Miklos Szeredi
2018-05-29 14:43 ` [PATCH 32/39] vfs: fix freeze protection in mnt_want_write_file() for overlayfs Miklos Szeredi
2018-06-04  8:50   ` Christoph Hellwig
2018-05-29 14:43 ` [PATCH 33/39] Revert "ovl: fix relatime for directories" Miklos Szeredi
2018-05-29 14:43 ` [PATCH 34/39] Revert "vfs: update ovl inode before relatime check" Miklos Szeredi
2018-05-29 14:43 ` [PATCH 35/39] Revert "vfs: add flags to d_real()" Miklos Szeredi
2018-05-29 14:43 ` [PATCH 36/39] Revert "vfs: do get_write_access() on upper layer of overlayfs" Miklos Szeredi
2018-05-29 14:43 ` [PATCH 37/39] Partially revert "locks: fix file locking on overlayfs" Miklos Szeredi
2018-05-29 14:43 ` [PATCH 38/39] Revert "fsnotify: support overlayfs" Miklos Szeredi
2018-05-29 14:43 ` [PATCH 39/39] vfs: remove open_flags from d_real() Miklos Szeredi

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=CAOQ4uxiUUtLAMxvDg8hMcgqZUV96dLs8stJPgh6w-pj4KGvabw@mail.gmail.com \
    --to=amir73il@gmail.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-unionfs@vger.kernel.org \
    --cc=mszeredi@redhat.com \
    --subject='Re: [PATCH 03/39] vfs: dedupe: extract helper for a single dedup' \
    /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

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).