Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44f54921 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  JFS: White space cleanup
  [PATCH] JFS: return correct error when i-node allocation failed
  JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog()
parents 3e04767a 63f83c9f

fs/jfs/endian24.h

+1 −1
Original line number Diff line number Diff line 
/*

 *   Copyright (c) International Business Machines Corp., 2001

 *   Copyright (C) International Business Machines Corp., 2001

 *

 *   This program is free software;  you can redistribute it and/or modify

 *   it under the terms of the GNU General Public License as published by

fs/jfs/jfs_acl.h

+4 −4
Original line number Diff line number Diff line 
/*

 *   Copyright (c) International Business Machines  Corp., 2002

 *   Copyright (C) International Business Machines  Corp., 2002

 *

 *   This program is free software;  you can redistribute it and/or modify

 *   it under the terms of the GNU General Public License as published by

fs/jfs/jfs_dinode.h

+4 −4
Original line number Diff line number Diff line 
/*

 *   Copyright (c) International Business Machines Corp., 2000-2001

 *   Copyright (C) International Business Machines Corp., 2000-2001

 *

 *   This program is free software;  you can redistribute it and/or modify

 *   it under the terms of the GNU General Public License as published by

fs/jfs/jfs_dmap.h

+14 −14
Original line number Diff line number Diff line 
/*

 *   Copyright (c) International Business Machines Corp., 2000-2002

 *   Copyright (C) International Business Machines Corp., 2000-2002

 *

 *   This program is free software;  you can redistribute it and/or modify

 *   it under the terms of the GNU General Public License as published by

fs/jfs/jfs_dtree.c

+9 −9
Original line number Diff line number Diff line
@@ -3780,13 +3780,13 @@ static int ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp, 
	lkey.name = (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),

					GFP_KERNEL);

	if (lkey.name == NULL)

		return -ENOSPC;

		return -ENOMEM;



	rkey.name = (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),

					GFP_KERNEL);

	if (rkey.name == NULL) {

		kfree(lkey.name);

		return -ENOSPC;

		return -ENOMEM;

	}



	/* get left and right key */