Re: [patch 00/35] Jeff's ReiserFS Patch Queue

[Jeff Mahoney]

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

Linus Torvalds wrote:
> 
> On Mon, 30 Mar 2009, Jeff Mahoney wrote:
>> I'd like to submit my reiserfs patch queue for inclusion into 2.6.30.
> 
> Hmm. Looks fine, and I merged it. I had a number of mostly trivial 
> conflicts (most due to the quota name cleanup to lower-case, with some 
> header file export cleanup conflicts added in), but they looked fairly 
> straightforward and I compile-tested the end result.
> 
> I don't have any reiserfs filesystems left, though, so you should really 
> double-check the end result.

Great, thanks! I realized just after I submitted that I didn't adjust
context to the last few days of mainline. The merge looks good except
for an added space in reiserfs_delete_inode. I've appended the patch for that.

>> Once this is applied, I expect reiserfs to be in deep maintenance-only 
>> mode.
> 
> Heh, I hadn't expected even this.

Hopefully it won't be. I still have to support reiserfs for our
enterprise releases, though. :)

- -Jeff

- ---
 fs/reiserfs/inode.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- --- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -52,7 +52,7 @@ void reiserfs_delete_inode(struct inode
 		/* Do quota update inside a transaction for journaled quotas. We must do that
 		 * after delete_object so that quota updates go into the same transaction as
 		 * stat data deletion */
- -		if (!err) 
+		if (!err)
 			vfs_dq_free_inode(inode);
 
 		if (journal_end(&th, inode->i_sb, jbegin_count))

- -- 
Jeff Mahoney
SUSE Labs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iEYEARECAAYFAknRJLQACgkQLPWxlyuTD7IuOgCbBmWsC7seMVyE7TLD2gejcHgz
c9EAn2Ey64m2xNZ8R53lWqvAiWlX4UcP
=Ugl0
-----END PGP SIGNATURE-----
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/