linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Mason <chris.mason@oracle.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	linux-btrfs <linux-btrfs@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [GIT PULL] Btrfs fixes
Date: Sun, 6 May 2012 09:35:41 -0400	[thread overview]
Message-ID: <20120506133541.GB30809@shiny> (raw)

Hi everyone,

The for-linus branch in the btrfs git repo has some fixes:

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

The big ones here are a memory leak we introduced in rc1, and 
a scheduling while atomic if the transid on disk doesn't match the
transid we expected.  This happens for corrupt blocks, or out of date
disks.

It also fixes up the ioctl definition for our ioctl to resolve logical
inode numbers.  The __u32 was a merging error and doesn't match what we
ship in the progs.

Chris Mason (2) commits (+36/-17):
    Btrfs: avoid sleeping in verify_parent_transid while atomic (+34/-17)
    Btrfs: Add properly locking around add_root_to_dirty_list (+2/-0)

Stefan Behrens (1) commits (+7/-0):
    Btrfs: fix crash in scrub repair code when device is missing

Josef Bacik (1) commits (+2/-2):
    Btrfs: fix page leak when allocing extent buffers

Alexander Block (1) commits (+2/-2):
    btrfs: Fix mismatching struct members in ioctl.h

Total: (5) commits (+47/-21)

 fs/btrfs/ctree.c       |   28 +++++++++++++++++++---------
 fs/btrfs/disk-io.c     |   18 +++++++++++++-----
 fs/btrfs/disk-io.h     |    3 ++-
 fs/btrfs/extent-tree.c |    2 +-
 fs/btrfs/extent_io.c   |    4 ++--
 fs/btrfs/ioctl.h       |    4 ++--
 fs/btrfs/scrub.c       |    7 +++++++
 fs/btrfs/tree-log.c    |    2 +-
 8 files changed, 47 insertions(+), 21 deletions(-)

             reply	other threads:[~2012-05-06 13:35 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-06 13:35 Chris Mason [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-01-13 22:01 [GIT PULL] Btrfs fixes Chris Mason
2015-05-15 19:11 Chris Mason
2015-05-01 14:08 Chris Mason
2015-04-26 13:18 Chris Mason
2015-03-20 16:55 Chris Mason
2015-01-23 18:49 Chris Mason
2015-01-08 18:28 Chris Mason
2014-11-01 16:05 Chris Mason
2014-09-19 19:47 Chris Mason
2013-03-17 12:34 Chris Mason
2013-02-07  0:13 Chris Mason
2013-01-23  0:48 Chris Mason
2013-01-23  1:28 ` Liu Bo
2013-01-23  1:40   ` Chris Mason
2013-01-24 21:52 ` Chris Mason
2013-01-25  3:13   ` Linus Torvalds
2012-10-26 14:19 Chris Mason
2012-04-28 12:27 Chris Mason
2012-01-27 16:34 Chris Mason
2011-12-23 17:24 Chris Mason
2011-12-16 17:53 Chris Mason
2011-12-16 18:20 ` Chris Mason
2011-12-08 19:24 Chris Mason
2011-11-22  1:30 Chris Mason
2011-11-11 21:40 Chris Mason
2011-09-19 23:57 Chris Mason
2011-09-20 16:19 ` Sage Weil
2011-07-08 18:55 [GIT PULL] btrfs fixes Chris Mason
2011-07-11 11:31 ` Tarkan Erimer
2010-04-12 20:00 [GIT PULL] Btrfs fixes 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=20120506133541.GB30809@shiny \
    --to=chris.mason@oracle.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).