linux-btrfs.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>,
	"linux-kernel" <linux-kernel@vger.kernel.org>
Subject: [GIT PULL] Btrfs updates
Date: Mon, 17 Jan 2011 16:13:01 -0500	[thread overview]
Message-ID: <1295298216-sup-6206@think> (raw)

Hi everyone,

The for-linus branch of the btrfs-unstable git tree:

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

Has our collection of features and fixes for 2.6.38-rc1.  The git tree
is actually against 2.6.36 and these commits have been tested against
.36, .37 and Linus' current git.  There's no particular reason for the
.36 part, other than it's what one of my build boxes was running.

The highlights this time around are LZO compression from Li Zefan and a
large collection of multi-device fixes from Miao Xie.  Liubo kicked in
the start of our forced-readonly support, which will be the building
block for ripping out a big collection of BUG_ONs and replacing them
with kinder gentler error messages.

Li Zefan also added readonly snapshot support, and I'll have the
corresponding btrfs-progs changes integrated this week.

This pull does have a duplicate for the btrfs ctree.c build fix that
Linus already has in his tree.  Git merge seems to do magic on this one,
it applies without doing a duplicate #include.

Li Zefan (9) commits (+1354/-542):
    Btrfs: Add BTRFS_IOC_SUBVOL_GETFLAGS/SETFLAGS ioctls (+85/-0)
    btrfs: Allow to specify compress method when defrag (+26/-2)
    btrfs: Allow to add new compression algorithm (+473/-282)
    btrfs: Extract duplicate decompress code (+115/-194)
    Btrfs: Refactor btrfs_ioctl_snap_create() (+40/-44)
    Btrfs: Add readonly snapshots support (+75/-10)
    btrfs: Add lzo compression support (+527/-8)
    btrfs: Fix error handling in zlib (+8/-0)
    btrfs: Fix bugs in zlib workspace (+5/-2)

Miao Xie (6) commits (+695/-186):
    btrfs: make the chunk allocator utilize the devices better (+300/-103)
    btrfs: try to reclaim some space when chunk allocation fails (+7/-2)
    btrfs: fix wrong free space information of btrfs (+286/-7)
    btrfs: restructure find_free_dev_extent() (+91/-68)
    btrfs: fix wrong calculation of stripe size (+8/-2)
    btrfs: fix wrong data space statistics (+3/-4)

Jesper Juhl (2) commits (+5/-1):
    btrfs: Don't pass NULL ptr to func that may deref it. (+2/-0)
    btrfs: Mem leak in btrfs_get_acl() (+3/-1)

Tsutomu Itoh (2) commits (+17/-0):
    btrfs: Fix memory leak in btrfs_read_fs_root_no_radix() (+1/-0)
    btrfs: check NULL or not (+16/-0)

Stefan Schmidt (1) commits (+1/-0):
    fs/btrfs: Fix build of ctree

Ben Hutchings (1) commits (+4/-0):
    btrfs: Require CAP_SYS_ADMIN for filesystem rebalance

Chris Mason (1) commits (+2/-1):
    Btrfs: fix off by one while setting block groups readonly

Dave Young (1) commits (+8/-4):
    btrfs: mount failure return value fix

liubo (1) commits (+523/-2):
    Btrfs: forced readonly mounts on errors

Josef Bacik (1) commits (+0/-5):
    Btrfs: don't warn if we get ENOSPC in btrfs_block_rsv_check

Total: (25) commits (+2609/-741)

 fs/btrfs/Kconfig        |    2 +
 fs/btrfs/Makefile       |    2 +-
 fs/btrfs/acl.c          |    4 +-
 fs/btrfs/btrfs_inode.h  |    2 +-
 fs/btrfs/compression.c  |  329 ++++++++++++++++++++++++-
 fs/btrfs/compression.h  |   72 ++++--
 fs/btrfs/ctree.c        |    8 +
 fs/btrfs/ctree.h        |   49 ++++-
 fs/btrfs/disk-io.c      |  412 ++++++++++++++++++++++++++++++-
 fs/btrfs/disk-io.h      |    1 +
 fs/btrfs/extent-tree.c  |   90 ++++++-
 fs/btrfs/extent_io.c    |    7 +-
 fs/btrfs/extent_io.h    |   17 ++-
 fs/btrfs/extent_map.c   |    2 +
 fs/btrfs/extent_map.h   |    3 +-
 fs/btrfs/file.c         |   13 +
 fs/btrfs/inode.c        |   90 +++++---
 fs/btrfs/ioctl.c        |  220 +++++++++++++----
 fs/btrfs/ioctl.h        |   12 +-
 fs/btrfs/lzo.c          |  420 +++++++++++++++++++++++++++++++
 fs/btrfs/ordered-data.c |   18 ++-
 fs/btrfs/ordered-data.h |    8 +-
 fs/btrfs/super.c        |  281 ++++++++++++++++++++--
 fs/btrfs/transaction.c  |   11 +
 fs/btrfs/transaction.h  |    1 +
 fs/btrfs/volumes.c      |  626 ++++++++++++++++++++++++++++++++++-------------
 fs/btrfs/volumes.h      |   27 ++
 fs/btrfs/xattr.c        |   18 ++
 fs/btrfs/zlib.c         |  369 ++++++----------------------
 29 files changed, 2491 insertions(+), 623 deletions(-)

             reply	other threads:[~2011-01-17 21:13 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-17 21:13 Chris Mason [this message]
2011-01-18 10:14 ` [GIT PULL] Btrfs updates 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
  -- 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-15 18:09 Chris Mason
2012-06-15 23:57 ` Linus Torvalds
2012-06-16  0:21   ` 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
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=1295298216-sup-6206@think \
    --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).