linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Mason <clm@fb.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-btrfs <linux-btrfs@vger.kernel.org>
Subject: [GIT PULL] Btrfs
Date: Tue, 9 May 2017 13:56:40 -0400	[thread overview]
Message-ID: <88747a65-7407-fcc5-4111-962440c082c8@fb.com> (raw)

Hi Linus,

My for-linus-4.12 branch:

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus-4.12

Has fixes and cleanups Dave Sterba collected for the merge window.

The biggest functional fixes are between btrfs raid5/6 and scrub, and
raid5/6 and device replacement.  Some of our pending qgroup fixes are
included as well while I bash on the rest in testing.

We also have the usual set of cleanups, including one that
__btrfs_map_block() much more maintainable, and conversions from
atomic_t to refcount_t.

Elena Reshetova (16) commits (+141/-135):
    btrfs: convert btrfs_delayed_ref_node.refs from atomic_t to refcount_t (+14/-12)
    btrfs: convert btrfs_transaction.use_count from atomic_t to refcount_t (+16/-14)
    btrfs: convert compressed_bio.pending_bios from atomic_t to refcount_t (+9/-9)
    btrfs: convert btrfs_caching_control.count from atomic_t to refcount_t (+8/-7)
    btrfs: convert btrfs_ordered_extent.refs from atomic_t to refcount_t (+11/-11)
    btrfs: convert btrfs_delayed_item.refs from atomic_t to refcount_t (+10/-10)
    btrfs: convert btrfs_delayed_node.refs from atomic_t to refcount_t (+16/-16)
    btrfs: convert btrfs_raid_bio.refs from atomic_t to refcount_t (+9/-10)
    btrfs: convert scrub_recover.refs from atomic_t to refcount_t (+4/-4)
    btrfs: convert scrub_parity.refs from atomic_t to refcount_t (+4/-4)
    btrfs: convert extent_state.refs from atomic_t to refcount_t (+9/-8)
    btrfs: convert extent_map.refs from atomic_t to refcount_t (+12/-11)
    btrfs: convert scrub_block.refs from atomic_t to refcount_t (+5/-5)
    btrfs: convert btrfs_root.refs from atomic_t to refcount_t (+4/-4)
    btrfs: convert scrub_ctx.refs from atomic_t to refcount_t (+5/-5)
    btrfs: convert btrfs_bio.refs from atomic_t to refcount_t (+5/-5)

Liu Bo (15) commits (+640/-425):
    Btrfs: do not add extra mirror when dev_replace target dev is not available (+4/-3)
    Btrfs: introduce a function to get extra mirror from replace (+89/-72)
    Btrfs: fix wrong failed mirror_num of read-repair on raid56 (+5/-0)
    Btrfs: set scrub page's io_error if failing to submit io (+6/-2)
    Btrfs: handle operations for device replace separately (+98/-81)
    Btrfs: enable repair during read for raid56 profile (+27/-13)
    Btrfs: separate DISCARD from __btrfs_map_block (+175/-114)
    Btrfs: remove ASSERT in btrfs_truncate_inode_items (+0/-7)
    Btrfs: switch to div64_u64 if with a u64 divisor (+7/-7)
    Btrfs: update scrub_parity to use u64 stripe_len (+4/-4)
    Btrfs: helper for ops that requires full stripe (+10/-8)
    Btrfs: create a helper for getting chunk map (+57/-111)
    Btrfs: update comments in cache_save_setup (+2/-1)
    Btrfs: add file item tracepoints (+154/-0)
    Btrfs: convert BUG_ON to WARN_ON (+2/-2)

David Sterba (12) commits (+72/-86):
    btrfs: remove redundant parameter from reada_start_machine_dev (+3/-4)
    btrfs: remove unused qgroup members from btrfs_trans_handle (+0/-20)
    btrfs: preallocate radix tree node for global readahead tree (+8/-1)
    btrfs: sink GFP flags parameter to tree_mod_log_insert_root (+5/-5)
    btrfs: sink GFP flags parameter to tree_mod_log_insert_move (+5/-5)
    btrfs: remove local blocksize variable in reada_find_extent (+2/-4)
    btrfs: remove redundant parameter from btree_readahead_hook (+5/-6)
    btrfs: drop redundant parameters from btrfs_map_sblock (+6/-9)
    btrfs: track exclusive filesystem operation in flags (+25/-26)
    btrfs: remove redundant parameter from reada_find_zone (+3/-3)
    btrfs: preallocate radix tree node for readahead (+8/-1)
    btrfs: use clear_page where appropriate (+2/-2)

Qu Wenruo (10) commits (+510/-96):
    btrfs: qgroup: Re-arrange tracepoint timing to co-operate with reserved space tracepoint (+6/-10)
    btrfs: qgroup: Fix qgroup corruption caused by inode_cache mount option (+18/-7)
    btrfs: Wait for in-flight bios before freeing target device for raid56 (+21/-0)
    btrfs: Fix metadata underflow caused by btrfs_reloc_clone_csum error (+39/-12)
    btrfs: Handle delalloc error correctly to avoid ordered extent hang (+48/-15)
    btrfs: qgroup: Add trace point for qgroup reserved space (+96/-44)
    btrfs: Prevent scrub recheck from racing with dev replace (+9/-4)
    btrfs: scrub: Don't append on-disk pages for raid56 scrub (+0/-4)
    btrfs: scrub: Introduce full stripe lock for RAID56 (+251/-0)
    btrfs: scrub: Fix RAID56 recovery race condition (+22/-0)

Filipe Manana (5) commits (+192/-41):
    Btrfs: fix incorrect space accounting after failure to insert inline extent (+4/-2)
    Btrfs: fix invalid attempt to free reserved space on failure to cow range (+45/-18)
    Btrfs: send, fix file hole not being preserved due to inline extent (+21/-2)
    Btrfs: fix extent map leak during fallocate error path (+3/-1)
    Btrfs: fix reported number of inode blocks (+119/-18)

Anand Jain (3) commits (+7/-8):
    btrfs: use q which is already obtained from bdev_get_queue (+3/-4)
    btrfs: check if the device is flush capable (+4/-0)
    btrfs: delete unused member nobarriers (+0/-4)

Edmund Nadolski (2) commits (+25/-20):
    btrfs: provide enumeration for __merge_refs mode argument (+13/-10)
    btrfs: replace hardcoded value with SEQ_LAST macro (+12/-10)

Goldwyn Rodrigues (2) commits (+24/-3):
    btrfs: qgroups: Retry after commit on getting EDQUOT (+23/-1)
    btrfs: No need to check !(flags & MS_RDONLY) twice (+1/-2)

Chris Mason (1) commits (+2/-2):
    btrfs: fix the gfp_mask for the reada_zones radix tree

Adam Borowski (1) commits (+9/-3):
    btrfs: fix a bogus warning when converting only data or metadata

Deepa Dinamani (1) commits (+2/-1):
    btrfs: Use ktime_get_real_ts for root ctime

Dan Carpenter (1) commits (+15/-26):
    Btrfs: handle only applicable errors returned by btrfs_get_extent

Dmitry V. Levin (1) commits (+2/-0):
    MAINTAINERS: add btrfs file entries for include directories

Hans van Kranenburg (1) commits (+5/-5):
    Btrfs: consistent usage of types in balance_args

Total: (71) commits

 MAINTAINERS                  |   2 +
 fs/btrfs/backref.c           |  41 ++-
 fs/btrfs/btrfs_inode.h       |   7 +
 fs/btrfs/compression.c       |  18 +-
 fs/btrfs/ctree.c             |  20 +-
 fs/btrfs/ctree.h             |  34 +-
 fs/btrfs/delayed-inode.c     |  46 +--
 fs/btrfs/delayed-inode.h     |   6 +-
 fs/btrfs/delayed-ref.c       |   8 +-
 fs/btrfs/delayed-ref.h       |   8 +-
 fs/btrfs/dev-replace.c       |   9 +-
 fs/btrfs/disk-io.c           |  13 +-
 fs/btrfs/disk-io.h           |   4 +-
 fs/btrfs/extent-tree.c       |  35 +-
 fs/btrfs/extent_io.c         |  59 +--
 fs/btrfs/extent_io.h         |   8 +-
 fs/btrfs/extent_map.c        |  10 +-
 fs/btrfs/extent_map.h        |   3 +-
 fs/btrfs/file.c              |  82 ++++-
 fs/btrfs/free-space-cache.c  |   2 +-
 fs/btrfs/inode.c             | 289 +++++++++++----
 fs/btrfs/ioctl.c             |  33 +-
 fs/btrfs/ordered-data.c      |  20 +-
 fs/btrfs/ordered-data.h      |   2 +-
 fs/btrfs/qgroup.c            | 102 ++----
 fs/btrfs/qgroup.h            |  51 ++-
 fs/btrfs/raid56.c            |  38 +-
 fs/btrfs/reada.c             |  37 +-
 fs/btrfs/root-tree.c         |   3 +-
 fs/btrfs/scrub.c             | 331 +++++++++++++++--
 fs/btrfs/send.c              |  23 +-
 fs/btrfs/super.c             |   3 +-
 fs/btrfs/tests/btrfs-tests.c |   1 -
 fs/btrfs/transaction.c       |  48 ++-
 fs/btrfs/transaction.h       |   6 +-
 fs/btrfs/tree-log.c          |   2 +-
 fs/btrfs/volumes.c           | 854 +++++++++++++++++++++++--------------------
 fs/btrfs/volumes.h           |   8 +-
 include/trace/events/btrfs.h | 187 +++++++++-
 include/uapi/linux/btrfs.h   |  10 +-
 40 files changed, 1629 insertions(+), 834 deletions(-)

             reply	other threads:[~2017-05-09 17:56 UTC|newest]

Thread overview: 126+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-09 17:56 Chris Mason [this message]
2017-05-09 18:01 ` [GIT PULL] Btrfs Chris Mason
  -- strict thread matches above, loose matches on Subject: below --
2017-06-10 13:00 Chris Mason
2017-04-28  0:26 Chris Mason
2017-04-14 18:28 Chris Mason
2017-03-31 21:05 Chris Mason
2017-03-23 15:09 Chris Mason
2017-03-02 20:19 Chris Mason
2017-02-25  0:56 Chris Mason
2017-02-11 13:18 Chris Mason
2017-01-27 19:37 Chris Mason
2016-12-16 17:01 Chris Mason
2016-11-04 17:28 Chris Mason
2016-10-28 14:08 Chris Mason
2016-10-14 20:31 Chris Mason
2016-10-11 15:46 Chris Mason
2016-09-23 20:01 Chris Mason
2016-09-09 17:46 Chris Mason
2016-09-03 13:54 Chris Mason
2016-08-26 23:36 Chris Mason
2016-08-10 12:10 Chris Mason
2016-08-04 19:12 Chris Mason
2016-07-31 13:55 Chris Mason
2016-06-18 13:01 Chris Mason
2016-06-10 20:01 Chris Mason
2016-06-03 20:57 Chris Mason
2016-05-27 17:44 Chris Mason
2016-05-21 14:18 Chris Mason
2016-04-08 20:43 Chris Mason
2016-04-01 22:45 Chris Mason
2016-03-22  0:24 Chris Mason
2016-03-22  1:16 ` Linus Torvalds
2016-03-22  2:15   ` Chris Mason
2016-03-22  2:24     ` Chris Mason
2016-03-22  2:38       ` Linus Torvalds
2016-03-04 18:51 Chris Mason
2016-02-19 19:08 Chris Mason
2016-02-12 16:43 Chris Mason
2016-01-29 18:42 Chris Mason
2016-01-22 16:34 Chris Mason
2016-01-17 23:30 Chris Mason
2016-01-18 10:25 ` Martin Steigerwald
2016-01-18 10:52   ` Holger Hoffstätte
2015-12-18 17:28 Chris Mason
2015-11-27 21:13 Chris Mason
2015-11-13 20:37 Chris Mason
2015-11-06 18:44 Chris Mason
2015-10-23 12:47 Chris Mason
2015-10-16 17:34 Chris Mason
2015-10-09 17:42 Chris Mason
2015-09-25 17:35 Chris Mason
2015-09-11 18:44 Chris Mason
2015-08-08 19:41 Chris Mason
2015-07-31 18:21 Chris Mason
2015-07-17 19:38 Chris Mason
2015-07-10 19:15 Chris Mason
2015-06-29 21:11 Chris Mason
2015-05-23  1:14 Chris Mason
2015-05-26 12:33 ` Josh Boyer
2015-05-26 12:54   ` Chris Mason
2015-06-02 14:02     ` Josh Boyer
2015-06-26 14:21       ` David Sterba
2015-03-06 21:45 Chris Mason
2015-02-26  2:01 Chris Mason
2015-02-19 20:36 Chris Mason
2015-02-20 10:09 ` Markus Trippelsdorf
2014-11-09  1:17 Chris Mason
2014-10-11  0:41 Chris Mason
2014-08-14 17:59 Chris Mason
2014-08-14 18:10 ` Linus Torvalds
2014-08-14 18:17   ` Chris Mason
2014-07-20 14:33 Chris Mason
2014-07-04 14:42 Chris Mason
2014-06-20 15:53 Chris Mason
2014-05-20 19:25 Chris Mason
2014-04-26 23:31 Chris Mason
2014-02-16 13:13 Chris Mason
2014-02-09 19:13 Chris Mason
2014-02-04 17:59 Chris Mason
2014-01-30 21:52 Chris Mason
2014-02-02  0:15 ` David Rientjes
2014-02-02  1:28   ` Filipe David Manana
2014-02-02  2:40     ` David Rientjes
2014-02-02  8:09     ` Chris Samuel
2014-02-03 17:54 ` David Sterba
2014-02-03 18:18   ` Chris Mason
2014-02-04 19:50     ` Greg KH
2014-02-04 19:52       ` Chris Mason
2013-12-12 21:57 Chris Mason
2013-11-21 18:35 Chris Mason
2013-11-15 15:19 Chris Mason
2013-11-15 16:11 ` Geert Uytterhoeven
2013-11-14 17:19 Chris Mason
2013-11-15 11:32 ` Heiko Carstens
2013-11-15 12:21   ` Chris Mason
2013-11-15 13:40     ` Chris Mason
2013-11-15 13:42       ` Geert Uytterhoeven
2013-11-15 14:57         ` Heiko Carstens
2013-11-17  9:36           ` Gleb Natapov
2013-11-18  9:35             ` Heiko Carstens
2013-11-18 10:30               ` Will Deacon
2013-10-18 23:24 Chris Mason
2013-10-12  1:01 Chris Mason
2013-10-05 17:36 Chris Mason
2013-09-22 20:50 Chris Mason
2013-09-12 15:36 Chris Mason
2013-09-12 20:38 ` Josh Boyer
2013-09-13  6:44   ` Geert Uytterhoeven
2013-09-13 11:53     ` Josh Boyer
2013-09-13 12:15       ` Russell King
2013-09-13 12:36         ` Geert Uytterhoeven
2013-09-13 15:06         ` Josh Boyer
2013-09-13 15:38           ` Josh Boyer
2013-09-13 15:58             ` Russell King
2013-09-14  9:33               ` Heiko Carstens
2013-09-13 13:07 ` Ric Wheeler
2013-09-13 14:11   ` Hugo Mills
2013-08-10 12:28 Chris Mason
2013-07-09 19:18 Chris Mason
2013-06-14  1:29 Chris Mason
2013-05-09 19:26 Chris Mason
2013-03-02 15:15 Chris Mason
2013-03-02 15:41 ` Liu Bo
2013-03-03  0:45 ` Linus Torvalds
2013-03-03  1:10   ` Chris Mason
2012-10-09 21:05 Chris Mason

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=88747a65-7407-fcc5-4111-962440c082c8@fb.com \
    --to=clm@fb.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.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 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).