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

Commit 9dce07f1 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

NULL noise: fs/*, mm/*, kernel/* 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1076d17a

fs/reiserfs/do_balan.c

+4 −4
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih, /* item h 
		return balance_leaf_when_delete(tb, flag);



	zeros_num = 0;

	if (flag == M_INSERT && body == 0)

	if (flag == M_INSERT && !body)

		zeros_num = ih_item_len(ih);



	pos_in_item = tb->tb_path->pos_in_item;
@@ -1728,7 +1728,7 @@ struct buffer_head *get_FEB(struct tree_balance *tb) 
	struct buffer_info bi;



	for (i = 0; i < MAX_FEB_SIZE; i++)

		if (tb->FEB[i] != 0)

		if (tb->FEB[i] != NULL)

			break;



	if (i == MAX_FEB_SIZE)
@@ -1827,7 +1827,7 @@ int get_left_neighbor_position(struct tree_balance *tb, int h) 
{

	int Sh_position = PATH_H_POSITION(tb->tb_path, h + 1);



	RFALSE(PATH_H_PPARENT(tb->tb_path, h) == 0 || tb->FL[h] == 0,

	RFALSE(PATH_H_PPARENT(tb->tb_path, h) == NULL || tb->FL[h] == NULL,

	       "vs-12325: FL[%d](%p) or F[%d](%p) does not exist",

	       h, tb->FL[h], h, PATH_H_PPARENT(tb->tb_path, h));
@@ -1841,7 +1841,7 @@ int get_right_neighbor_position(struct tree_balance *tb, int h) 
{

	int Sh_position = PATH_H_POSITION(tb->tb_path, h + 1);



	RFALSE(PATH_H_PPARENT(tb->tb_path, h) == 0 || tb->FR[h] == 0,

	RFALSE(PATH_H_PPARENT(tb->tb_path, h) == NULL || tb->FR[h] == NULL,

	       "vs-12330: F[%d](%p) or FR[%d](%p) does not exist",

	       h, PATH_H_PPARENT(tb->tb_path, h), h, tb->FR[h]);

fs/reiserfs/fix_node.c

+5 −3
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static void create_virtual_node(struct tree_balance *tb, int h) 
	if (vn->vn_mode == M_INSERT) {

		struct virtual_item *vi = vn->vn_vi + vn->vn_affected_item_num;



		RFALSE(vn->vn_ins_ih == 0,

		RFALSE(vn->vn_ins_ih == NULL,

		       "vs-8040: item header of inserted item is not specified");

		vi->vi_item_len = tb->insert_size[0];

		vi->vi_ih = vn->vn_ins_ih;
@@ -857,7 +857,8 @@ static int get_lfree(struct tree_balance *tb, int h) 
	struct buffer_head *l, *f;

	int order;



	if ((f = PATH_H_PPARENT(tb->tb_path, h)) == 0 || (l = tb->FL[h]) == 0)

	if ((f = PATH_H_PPARENT(tb->tb_path, h)) == NULL ||

	    (l = tb->FL[h]) == NULL)

		return 0;



	if (f == l)
@@ -878,7 +879,8 @@ static int get_rfree(struct tree_balance *tb, int h) 
	struct buffer_head *r, *f;

	int order;



	if ((f = PATH_H_PPARENT(tb->tb_path, h)) == 0 || (r = tb->FR[h]) == 0)

	if ((f = PATH_H_PPARENT(tb->tb_path, h)) == NULL ||

	    (r = tb->FR[h]) == NULL)

		return 0;



	if (f == r)

fs/reiserfs/lbalance.c

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ static void leaf_define_dest_src_infos(int shift_mode, struct tree_balance *tb, 
			       "vs-10250: leaf_define_dest_src_infos: shift type is unknown (%d)",

			       shift_mode);

	}

	RFALSE(src_bi->bi_bh == 0 || dest_bi->bi_bh == 0,

	RFALSE(!src_bi->bi_bh || !dest_bi->bi_bh,

	       "vs-10260: mode==%d, source (%p) or dest (%p) buffer is initialized incorrectly",

	       shift_mode, src_bi->bi_bh, dest_bi->bi_bh);

}

fs/reiserfs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, 
	buflen = DEH_SIZE + ROUND_UP(namelen);

	if (buflen > sizeof(small_buf)) {

		buffer = kmalloc(buflen, GFP_NOFS);

		if (buffer == 0)

		if (!buffer)

			return -ENOMEM;

	} else

		buffer = small_buf;

fs/smbfs/smbiod.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ int smbiod_retry(struct smb_sb_info *server) 


	smb_close_socket(server);



	if (pid == 0) {

	if (!pid) {

		/* FIXME: this is fatal, umount? */

		printk(KERN_ERR "smb_retry: no connection process\n");

		server->state = CONN_RETRIED;