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

Commit 0222e657 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Linus Torvalds
Browse files

reiserfs: strip trailing whitespace



This patch strips trailing whitespace from the reiserfs code.

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3cd6dbe6
Loading
Loading
Loading
Loading
+60 −60
Original line number Original line Diff line number Diff line
@@ -212,7 +212,7 @@ static void allocate_bitmap_nodes(struct super_block *p_s_sb)
			list_add(&bn->list, &journal->j_bitmap_nodes);
			list_add(&bn->list, &journal->j_bitmap_nodes);
			journal->j_free_bitmap_nodes++;
			journal->j_free_bitmap_nodes++;
		} else {
		} else {
			break;	// this is ok, we'll try again when more are needed 
			break;	/* this is ok, we'll try again when more are needed */
		}
		}
	}
	}
}
}
+15 −15
Original line number Original line Diff line number Diff line
@@ -1162,7 +1162,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,
	return retval;
	return retval;
}
}


// de contains information pointing to an entry which 
/* de contains information pointing to an entry which */
static int de_still_valid(const char *name, int len,
static int de_still_valid(const char *name, int len,
			  struct reiserfs_dir_entry *de)
			  struct reiserfs_dir_entry *de)
{
{
@@ -1465,7 +1465,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
	}
	}


	if (S_ISDIR(old_inode_mode)) {
	if (S_ISDIR(old_inode_mode)) {
		// adjust ".." of renamed directory 
		/* adjust ".." of renamed directory */
		set_ino_in_dir_entry(&dot_dot_de, INODE_PKEY(new_dir));
		set_ino_in_dir_entry(&dot_dot_de, INODE_PKEY(new_dir));
		journal_mark_dirty(&th, new_dir->i_sb, dot_dot_de.de_bh);
		journal_mark_dirty(&th, new_dir->i_sb, dot_dot_de.de_bh);


+4 −4
Original line number Original line Diff line number Diff line
@@ -1443,7 +1443,7 @@ static int maybe_indirect_to_direct(struct reiserfs_transaction_handle *th,
	if (atomic_read(&p_s_inode->i_count) > 1 ||
	if (atomic_read(&p_s_inode->i_count) > 1 ||
	    !tail_has_to_be_packed(p_s_inode) ||
	    !tail_has_to_be_packed(p_s_inode) ||
	    !page || (REISERFS_I(p_s_inode)->i_flags & i_nopack_mask)) {
	    !page || (REISERFS_I(p_s_inode)->i_flags & i_nopack_mask)) {
		// leave tail in an unformatted node    
		/* leave tail in an unformatted node */
		*p_c_mode = M_SKIP_BALANCING;
		*p_c_mode = M_SKIP_BALANCING;
		cut_bytes =
		cut_bytes =
		    n_block_size - (n_new_file_size & (n_block_size - 1));
		    n_block_size - (n_new_file_size & (n_block_size - 1));
+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode,
	/* Set the key to search for the place for new unfm pointer */
	/* Set the key to search for the place for new unfm pointer */
	make_cpu_key(&end_key, inode, tail_offset, TYPE_INDIRECT, 4);
	make_cpu_key(&end_key, inode, tail_offset, TYPE_INDIRECT, 4);


	// FIXME: we could avoid this 
	/* FIXME: we could avoid this */
	if (search_for_position_by_key(sb, &end_key, path) == POSITION_FOUND) {
	if (search_for_position_by_key(sb, &end_key, path) == POSITION_FOUND) {
		reiserfs_error(sb, "PAP-14030",
		reiserfs_error(sb, "PAP-14030",
			       "pasted or inserted byte exists in "
			       "pasted or inserted byte exists in "
+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+7 −7

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+3 −3

File changed.

Contains only whitespace changes.

+4 −4

File changed.

Contains only whitespace changes.

+19 −19

File changed.

Contains only whitespace changes.

+13 −13

File changed.

Contains only whitespace changes.

+5 −5

File changed.

Contains only whitespace changes.

+7 −7

File changed.

Contains only whitespace changes.

+2 −2

File changed.

Contains only whitespace changes.

+5 −5

File changed.

Contains only whitespace changes.

+26 −26

File changed.

Contains only whitespace changes.

+9 −9

File changed.

Contains only whitespace changes.

Loading