linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Mason <chris.mason@fusionio.com>
To: <torvalds@linux-foundation.org>, <linux-btrfs@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: [GIT PULL] Btrfs updates
Date: Fri, 15 Jun 2012 14:09:57 -0400	[thread overview]
Message-ID: <20120615180957.GE19150@shiny> (raw)

Hi Linus,

Please pull my for-linus branch:

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

The dates look like I had to rebase this morning because there was a compiler
warning for a printk arg that I had missed earlier.

These are all fixes, including one to prevent using stale pointers for
device names, and lots of fixes around transaction abort cleanups
(Josef, Liu Bo).

Jan Schmidt also sent in a number of fixes for the new reference number
tracking code.

Liu Bo beat me to updating the MAINTAINERS file.  Since he thought to
also fix the git url, I kept his commit.

Josef Bacik (10) commits (+303/-102):
    Btrfs: pass locked_page into extent_clear_unlock_delalloc if theres an error (+2/-2)
    Btrfs: unlock everything properly in the error case for nocow (+35/-2)
    Btrfs: wake up transaction waiters when aborting a transaction (+7/-6)
    Btrfs: call filemap_fdatawrite twice for compression (+31/-7)
    Btrfs: fix locking in btrfs_destroy_delayed_refs (+17/-13)
    Btrfs: keep inode pinned when compressing writes (+6/-2)
    Btrfs: abort the transaction if the commit fails (+8/-2)
    Btrfs: use rcu to protect device->name (+162/-64)
    Btrfs: fix btrfs_destroy_marked_extents (+2/-4)
    Btrfs: implement ->show_devname (+33/-0)

Jan Schmidt (6) commits (+72/-37):
    Btrfs: remove obsolete btrfs_next_leaf call from __resolve_indirect_ref (+1/-9)
    Btrfs: remove call to btrfs_header_nritems with no effect (+0/-3)
    Btrfs: fix return value for __tree_mod_log_oldest_root (+20/-13)
    Btrfs: use btrfs_read_lock_root_node in get_old_root (+16/-4)
    Btrfs: fix race in tree mod log addition (+19/-4)
    Btrfs: add btrfs_next_old_leaf (+16/-4)

Liu Bo (5) commits (+29/-5):
    Btrfs: avoid memory leak of extent state in error handling routine (+2/-0)
    Btrfs: make sure that we've made everything in pinned tree clean (+11/-0)
    Btrfs: update MAINTAINERS info for BTRFS FILE SYSTEM (+2/-2)
    Btrfs: fix missing inherited flag in rename (+6/-3)
    Btrfs: do not resize a seeding device (+8/-0)

Li Zefan (2) commits (+50/-49):
    Btrfs: fix incompat flags setting (+1/-1)
    Btrfs: fix defrag regression (+49/-48)

Miao Xie (1) commits (+27/-0):
    Btrfs: destroy the items of the delayed inodes in error handling routine

Total: (24) commits (+481/-193)

 MAINTAINERS                |    4 +-
 fs/btrfs/backref.c         |   17 ++-----
 fs/btrfs/btrfs_inode.h     |    1 +
 fs/btrfs/check-integrity.c |   16 +++---
 fs/btrfs/ctree.c           |   86 +++++++++++++++++++++++---------
 fs/btrfs/ctree.h           |    2 +
 fs/btrfs/delayed-inode.c   |   18 +++++++
 fs/btrfs/delayed-inode.h   |    3 ++
 fs/btrfs/disk-io.c         |   76 +++++++++++++++++-----------
 fs/btrfs/extent_io.c       |    7 +--
 fs/btrfs/inode.c           |   73 +++++++++++++++++++++------
 fs/btrfs/ioctl.c           |  118 +++++++++++++++++++++++++-------------------
 fs/btrfs/ordered-data.c    |   22 ++++++++-
 fs/btrfs/rcu-string.h      |   56 +++++++++++++++++++++
 fs/btrfs/scrub.c           |   30 ++++++-----
 fs/btrfs/super.c           |   33 +++++++++++++
 fs/btrfs/transaction.c     |   14 +++++-
 fs/btrfs/volumes.c         |   92 +++++++++++++++++++++-------------
 fs/btrfs/volumes.h         |    2 +-
 19 files changed, 479 insertions(+), 191 deletions(-)

             reply	other threads:[~2012-06-15 18:10 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-15 18:09 Chris Mason [this message]
2012-06-15 23:57 ` [GIT PULL] Btrfs updates Linus Torvalds
2012-06-16  0:21   ` Chris Mason
  -- strict thread matches above, loose matches on Subject: below --
2013-05-18 14:30 Chris Mason
2013-03-29 17:47 Chris Mason
2013-03-09  0:38 Chris Mason
2013-02-16  1:55 Chris Mason
2012-12-17 21:44 Chris Mason
2012-12-19 18:09 ` Roy Sigurd Karlsbakk
2012-12-19 19:07   ` Hugo Mills
2012-12-17 21:28 Chris Mason
2012-08-29 16:01 Chris Mason
2012-07-05 19:55 Chris Mason
2012-06-21 15:47 Chris Mason
2012-06-01 13:18 Chris Mason
2012-04-13 13:38 Chris Mason
2012-04-16  1:19 ` Tsutomu Itoh
2012-03-10  2:01 Chris Mason
2012-02-24 16:41 Chris Mason
2011-12-01 15:39 Chris Mason
2011-12-05  8:10 ` Miao Xie
2011-12-05 13:14   ` Chris Mason
2011-12-05 14:08     ` David Sterba
2011-12-06  3:25     ` Miao Xie
2011-08-18 18:04 Chris Mason
2011-08-18 21:51 ` Sage Weil
2011-08-20 14:01   ` Chris Mason
2011-07-27 22:46 Chris Mason
2011-06-27 18:15 Chris Mason
2011-06-20  1:12 Chris Mason
2011-06-12 11:57 Chris Mason
2011-06-12 18:08 ` Linus Torvalds
2011-06-13  1:02 ` Andi Kleen
2011-06-13  1:52   ` Chris Mason
2011-06-13  2:05   ` Li Zefan
2011-06-04 14:37 Chris Mason
2011-05-27 19:55 Chris Mason
2011-05-27 21:44 ` Chester
2011-05-15 14:47 Chris Mason
2011-05-15 15:41 ` kehon
2011-04-26 14:24 Chris Mason
2011-04-18 14:26 Chris Mason
2011-02-15  3:49 Chris Mason
2011-02-07 20:12 Chris Mason
2011-02-08 20:05 ` Helmut Hullen
2011-01-17 21:13 Chris Mason
2011-01-18 10:14 ` Felix Blanke
2011-01-18 15:22   ` C Anthony Risinger
2011-01-18 17:56     ` Mitch Harder
2011-01-18 18:51       ` C Anthony Risinger
2011-01-19  9:15     ` Spelic
2011-01-22 23:41       ` Clemens Eisserer
2011-01-22 23:53         ` cwillu
2011-01-18 18:55   ` Goffredo Baroncelli
2011-03-09 22:01 ` Diego Calleja
2010-12-14  1:54 Chris Mason
2010-05-27 15:15 Chris Mason
2010-05-27 17:18 ` Linus Torvalds
2010-05-27 17:32   ` Chris Mason
2010-05-27 17:47     ` Linus Torvalds
2010-06-02  2:59 ` Miao Xie
2010-09-12 12:38 ` Felipe Contreras
2010-04-05 19:36 Chris Mason
2010-04-06 15:40 ` Chris Mason
2010-03-15 19:18 Chris Mason
2010-03-16 21:01 ` Chris Mason
2010-03-18 16:59   ` Chris Mason
2009-10-15  0:06 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=20120615180957.GE19150@shiny \
    --to=chris.mason@fusionio.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).