Skip to contentSkip to conversation

UBIFS changes for 2.6.32

GIT PULL Artem Bityutskiy 1 participant 1 message Sep 21, 2009

lore
Share & tools
lore
#0 lore raw

Hi Linus,

please, pull UBIFS tree. Below goes the 'git request-pull' info, which mentions one merge commit. I had to create it in order to resolve conflicts with the per-bdi writeback changes, which went in this merge window from the 'linux-2.6-block' tree.

The following changes since commit ebc79c4f8da0f92efa968e0328f32334a2ce80cf:
Linus Torvalds (1):

        Merge git://git.kernel.org/.../jaswinder/linux-2.6

are available in the git repository at:

git://git.infradead.org/ubifs-2.6.git linux-next

Artem Bityutskiy (13):
UBIFS: kill BKL
UBIFS: remove unneeded call from ubifs_sync_fs
UBIFS: constify file and inode operations
UBIFS: add inode size debugging check
UBIFS: do not print scary error messages needlessly
UBIFS: check ubifs_scan error codes better
UBIFS: amend commentaries
UBIFS: define journal head numbers in ubifs-media.h
UBIFS: improve journal head debugging prints
UBIFS: various minor commentary fixes
UBIFS: improve lprops dump
UBIFS: fix debugging dump
Merge branch 'master' of git://git.kernel.org/.../torvalds/linux-2.6 into linux-next

Subrata Modak (2):
UBIFS: suppress compilation warning
UBIFS: remove unused functions

 fs/ubifs/budget.c      |    2 +-
 fs/ubifs/commit.c      |    2 +-
 fs/ubifs/debug.c       |  112 +++++++++++++++++++++++++++++++++++++++++++++---
 fs/ubifs/debug.h       |    5 ++
 fs/ubifs/file.c        |   62 +++++++++++++--------------
 fs/ubifs/gc.c          |    2 +-
 fs/ubifs/io.c          |   29 ++++++------
 fs/ubifs/journal.c     |   13 +++--
 fs/ubifs/key.h         |   35 +++------------
 fs/ubifs/log.c         |   17 ++++---
 fs/ubifs/lprops.c      |   43 +++++++++----------
 fs/ubifs/master.c      |   20 ++++++---
 fs/ubifs/orphan.c      |    7 ++-
 fs/ubifs/recovery.c    |    4 +-
 fs/ubifs/replay.c      |    6 +-
 fs/ubifs/scan.c        |   32 +++++++++----
 fs/ubifs/super.c       |   33 ++++----------
 fs/ubifs/tnc.c         |   76 +++++++++++++++++++++++++++++++-
 fs/ubifs/tnc_commit.c  |    2 +-
 fs/ubifs/ubifs-media.h |    7 +++
 fs/ubifs/ubifs.h       |   13 +++---
 fs/ubifs/xattr.c       |    4 +-
 22 files changed, 345 insertions(+), 181 deletions(-)

Thanks,
Artem.