2014-06-04 20:28:04

by Jan Kara

[permalink] [raw]
Subject: [GIT PULL] Reiserfs & ext3 changes for 3.16-rc1

Hello Linus,

could you please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git for_linus

to get big reiserfs cleanup from Jeff, an ext3 deadlock fix, and some small
cleanups.

Top of the tree is 166418ccefc3. The full shortlog is:

Fabian Frederick (2):
reiserfs: remove obsolete __constant_cpu_to_le32
fs/jbd/revoke.c: replace shift loop by ilog2

Jan Kara (1):
ext3: Fix deadlock in data=journal mode when fs is frozen

Jeff Mahoney (30):
reiserfs: use per-fs commit workqueues
reiserfs: cleanup, rename key and item accessors to more friendly names
reiserfs: cleanup, reformat comments to normal kernel style
reiserfs: cleanup, remove nblocks argument from journal_end
reiserfs: cleanup, remove sb argument from journal_end
reiserfs: cleanup, remove sb argument from journal_mark_dirty
reiserfs: cleanup, remove blocks arg from journal_join
reiserfs: cleanup, remove unnecessary parens in dirent creation
reiserfs: cleanup, remove leading whitespace from labels
reiserfs: cleanup, remove unnecessary parens
reiserfs: cleanup, make hash detection saner
reiserfs: balance_leaf refactor, reformat balance_leaf comments
reiserfs: balance_leaf refactor, move state variables into tree_balance
reiserfs: balance_leaf refactor, pull out balance_leaf_insert_left
reiserfs: balance_leaf refactor, pull out balance_leaf_paste_left
reiserfs: balance_leaf refactor, pull out balance_leaf_insert_right
reiserfs: balance_leaf refactor, pull out balance_leaf_paste_right
reiserfs: balance_leaf refactor, pull out balance_leaf_new_nodes_insert
reiserfs: balance_leaf refactor, pull out balance_leaf_new_nodes_paste
reiserfs: balance_leaf refactor pull out balance_leaf_finish_node_insert
reiserfs: balance_leaf refactor, pull out balance_leaf_finish_node_paste
reiserfs: balance_leaf refactor, pull out balance_leaf{left, right, new_nodes, finish_node}
reiserfs: balance_leaf refactor, format balance_leaf_insert_left
reiserfs: balance_leaf refactor, format balance_leaf_paste_left
reiserfs: balance_leaf refactor, format balance_leaf_insert_right
reiserfs: balance_leaf refactor, format balance_leaf_paste_right
reiserfs: balance_leaf refactor, format balance_leaf_new_nodes_paste
reiserfs: balance_leaf refactor, format balance_leaf_finish_node
reiserfs: balance_leaf refactor, split up balance_leaf_when_delete
reiserfs: call truncate_setsize under tailpack mutex

The diffstat is

fs/ext3/inode.c | 33 +-
fs/jbd/revoke.c | 12 +-
fs/reiserfs/bitmap.c | 259 +++--
fs/reiserfs/dir.c | 156 +--
fs/reiserfs/do_balan.c | 2449 +++++++++++++++++++++++------------------
fs/reiserfs/file.c | 90 +-
fs/reiserfs/fix_node.c | 1008 ++++++++++-------
fs/reiserfs/hashes.c | 15 +-
fs/reiserfs/ibalance.c | 271 +++--
fs/reiserfs/inode.c | 1206 +++++++++++---------
fs/reiserfs/ioctl.c | 27 +-
fs/reiserfs/item_ops.c | 108 +-
fs/reiserfs/journal.c | 1339 ++++++++++++----------
fs/reiserfs/lbalance.c | 501 +++++----
fs/reiserfs/namei.c | 513 +++++----
fs/reiserfs/objectid.c | 101 +-
fs/reiserfs/prints.c | 176 +--
fs/reiserfs/reiserfs.h | 1921 ++++++++++++++++++++------------
fs/reiserfs/resize.c | 75 +-
fs/reiserfs/stree.c | 892 ++++++++-------
fs/reiserfs/super.c | 552 ++++++----
fs/reiserfs/tail_conversion.c | 161 +--
fs/reiserfs/xattr.c | 70 +-
fs/reiserfs/xattr.h | 3 +-
fs/reiserfs/xattr_acl.c | 38 +-
25 files changed, 7056 insertions(+), 4920 deletions(-)

Thanks
Honza

--
Jan Kara <[email protected]>
SUSE Labs, CR


2014-06-07 23:52:52

by Linus Torvalds

[permalink] [raw]
Subject: Re: [GIT PULL] Reiserfs & ext3 changes for 3.16-rc1

On Wed, Jun 4, 2014 at 1:27 PM, Jan Kara <[email protected]> wrote:
> Hello Linus,
>
> could you please pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git for_linus
>
> to get big reiserfs cleanup from Jeff, an ext3 deadlock fix, and some small
> cleanups.

This does not work at all for me:

fs/reiserfs/do_balan.c: In function ‘balance_leaf_new_nodes’:
fs/reiserfs/do_balan.c:1248:3: error: implicit declaration of
function ‘format_bh’ [-Werror=implicit-function-declaration]
RFALSE(!buffer_journaled(tb->S_new[i])
^

Hmm? "format_bh()"?

Linus

2014-06-09 20:10:27

by Jeff Mahoney

[permalink] [raw]
Subject: Re: [GIT PULL] Reiserfs & ext3 changes for 3.16-rc1

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 6/7/14, 7:52 PM, Linus Torvalds wrote:
> On Wed, Jun 4, 2014 at 1:27 PM, Jan Kara <[email protected]> wrote:
>> Hello Linus,
>>
>> could you please pull from
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git
>> for_linus
>>
>> to get big reiserfs cleanup from Jeff, an ext3 deadlock fix, and
>> some small cleanups.
>
> This does not work at all for me:
>
> fs/reiserfs/do_balan.c: In function ‘balance_leaf_new_nodes’:
> fs/reiserfs/do_balan.c:1248:3: error: implicit declaration of
> function ‘format_bh’ [-Werror=implicit-function-declaration]
> RFALSE(!buffer_journaled(tb->S_new[i]) ^
>
> Hmm? "format_bh()"?

Weird. That's part of a follow-on patchset. One of the patches gets
rid of do_reiserfs_warning printing into a static buffer w/o a lock. I
must've forgotten a 'quilt add' when adding that chunk to the newer
patch. I'll review what else, if anything, might've changed but for
now, that should be be s/format_bh(tb->S_new[i])/tb->S_new[i]/.

- -Jeff

- --
Jeff Mahoney
SUSE Labs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)

iQIcBAEBAgAGBQJTlhSqAAoJEB57S2MheeWyy+IP/iYBJbocG4hF8364ognOfyX+
Q1wEzuNvRbZkplNueI1spfvdSJdJ2xMkWYXhaX2WwjQtG+pibLTUbFe8fgEh4egL
0yxtkENeJye0RsCJVALH25iu3iL0u6e03phM6FyvgkRra1jOWSMXJTAlV8ZpQs3o
EXBQ5qoojOaWc3yGmYEugXkLOp5JyJZn0S9EbWqBKw9v8e01kz1zxzfUAoiYb6Ug
hhoXiP2MOhTsgGgMJcCuk2cPNZ2CmHBlv++hGmyA/Dbne1oi+TacaHilwXI2xNI+
fU0IgSVdVC4avZDXXAXLbz0oBLz4/ba/OIiFN8htipNU9wUBJ+GFawpEZIqZ8iTz
WEptpUhcjZdc2SXJxuajjf2Am4VmTt3Rv/wg8kvopD0ANT9sJxLPuKENFqqiusVe
ugE7tL4JkHbz4vm4cbNu3YP7LfXtq/s3EpwiW5SJMVcKURaOriyYrOYbdJ73yKwb
P1K7sj+z3zKmPVuRrbDOgyVKMP1xxb8/ockJVawRUx4vZcn08Nu5f7ZofPewW/mT
XVHDe+YFC+IGLqJwudE0j6O6ZAWZTt1uJeg6IoFenuJhZACZiT/dhR2r5z/kCclk
0VFpLhKR+xy8Q7BB3gDWYZ/NFS7RA8gEu0pbIOj36LUyERX4UeUOsH+oWYoxLvwj
sazZbiauomfvBVZxu4+f
=4Lqx
-----END PGP SIGNATURE-----

2014-06-11 17:37:35

by Jan Kara

[permalink] [raw]
Subject: Re: [GIT PULL] Reiserfs & ext3 changes for 3.16-rc1

On Sat 07-06-14 16:52:49, Linus Torvalds wrote:
> On Wed, Jun 4, 2014 at 1:27 PM, Jan Kara <[email protected]> wrote:
> > Hello Linus,
> >
> > could you please pull from
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git for_linus
> >
> > to get big reiserfs cleanup from Jeff, an ext3 deadlock fix, and some small
> > cleanups.
>
> This does not work at all for me:
>
> fs/reiserfs/do_balan.c: In function ‘balance_leaf_new_nodes’:
> fs/reiserfs/do_balan.c:1248:3: error: implicit declaration of
> function ‘format_bh’ [-Werror=implicit-function-declaration]
> RFALSE(!buffer_journaled(tb->S_new[i])
> ^
>
> Hmm? "format_bh()"?
Bah, so I screwed up and apparently didn't push out my for_next branch
after merging patches from Jeff so various build bots didn't catch the
problem and I only compiled kernels without CONFIG_REISERFS_DEBUG_CHECK so
I didn't see the problem either. Anyway, I've added commit fixing this to
my for_next & for_linus branches (things now compile fine) and I'll send
you new pull request. I'm sorry for the mess.

Honza
--
Jan Kara <[email protected]>
SUSE Labs, CR