Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

befs: remove trailing whitespaces

Removing all trailing whitespaces in befs.

I was skeptic about tainting the history with this, but whitespace changes
can be ignored by using 'git blame -w' and 'git log -w'.

Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>

+47 -48
+2 -2
fs/befs/befs_fs_types.h
··· 79 79 BEFS_INODE_WAS_WRITTEN = 0x00020000, 80 80 BEFS_NO_TRANSACTION = 0x00040000, 81 81 }; 82 - /* 82 + /* 83 83 * On-Disk datastructures of BeFS 84 84 */ 85 85 ··· 139 139 140 140 } PACKED befs_super_block; 141 141 142 - /* 142 + /* 143 143 * Note: the indirect and dbl_indir block_runs may 144 144 * be longer than one block! 145 145 */
+24 -24
fs/befs/btree.c
··· 12 12 * 13 13 * Dominic Giampaolo, author of "Practical File System 14 14 * Design with the Be File System", for such a helpful book. 15 - * 16 - * Marcus J. Ranum, author of the b+tree package in 15 + * 16 + * Marcus J. Ranum, author of the b+tree package in 17 17 * comp.sources.misc volume 10. This code is not copied from that 18 18 * work, but it is partially based on it. 19 19 * ··· 38 38 */ 39 39 40 40 /* Befs B+tree structure: 41 - * 41 + * 42 42 * The first thing in the tree is the tree superblock. It tells you 43 43 * all kinds of useful things about the tree, like where the rootnode 44 44 * is located, and the size of the nodes (always 1024 with current version 45 45 * of BeOS). 46 46 * 47 47 * The rest of the tree consists of a series of nodes. Nodes contain a header 48 - * (struct befs_btree_nodehead), the packed key data, an array of shorts 48 + * (struct befs_btree_nodehead), the packed key data, an array of shorts 49 49 * containing the ending offsets for each of the keys, and an array of 50 - * befs_off_t values. In interior nodes, the keys are the ending keys for 51 - * the childnode they point to, and the values are offsets into the 52 - * datastream containing the tree. 50 + * befs_off_t values. In interior nodes, the keys are the ending keys for 51 + * the childnode they point to, and the values are offsets into the 52 + * datastream containing the tree. 53 53 */ 54 54 55 55 /* Note: 56 - * 57 - * The book states 2 confusing things about befs b+trees. First, 56 + * 57 + * The book states 2 confusing things about befs b+trees. First, 58 58 * it states that the overflow field of node headers is used by internal nodes 59 59 * to point to another node that "effectively continues this one". Here is what 60 60 * I believe that means. Each key in internal nodes points to another node that 61 - * contains key values less than itself. Inspection reveals that the last key 62 - * in the internal node is not the last key in the index. Keys that are 63 - * greater than the last key in the internal node go into the overflow node. 61 + * contains key values less than itself. Inspection reveals that the last key 62 + * in the internal node is not the last key in the index. Keys that are 63 + * greater than the last key in the internal node go into the overflow node. 64 64 * I imagine there is a performance reason for this. 65 65 * 66 - * Second, it states that the header of a btree node is sufficient to 67 - * distinguish internal nodes from leaf nodes. Without saying exactly how. 66 + * Second, it states that the header of a btree node is sufficient to 67 + * distinguish internal nodes from leaf nodes. Without saying exactly how. 68 68 * After figuring out the first, it becomes obvious that internal nodes have 69 69 * overflow nodes and leafnodes do not. 70 70 */ 71 71 72 - /* 72 + /* 73 73 * Currently, this code is only good for directory B+trees. 74 74 * In order to be used for other BFS indexes, it needs to be extended to handle 75 75 * duplicate keys and non-string keytypes (int32, int64, float, double). ··· 237 237 * with @key (usually the disk block number of an inode). 238 238 * 239 239 * On failure, returns BEFS_ERR or BEFS_BT_NOT_FOUND. 240 - * 241 - * Algorithm: 240 + * 241 + * Algorithm: 242 242 * Read the superblock and rootnode of the b+tree. 243 243 * Drill down through the interior nodes using befs_find_key(). 244 244 * Once at the correct leaf node, use befs_find_key() again to get the ··· 402 402 * 403 403 * Here's how it works: Key_no is the index of the key/value pair to 404 404 * return in keybuf/value. 405 - * Bufsize is the size of keybuf (BEFS_NAME_LEN+1 is a good size). Keysize is 405 + * Bufsize is the size of keybuf (BEFS_NAME_LEN+1 is a good size). Keysize is 406 406 * the number of characters in the key (just a convenience). 407 407 * 408 408 * Algorithm: 409 409 * Get the first leafnode of the tree. See if the requested key is in that 410 - * node. If not, follow the node->right link to the next leafnode. Repeat 410 + * node. If not, follow the node->right link to the next leafnode. Repeat 411 411 * until the (key_no)th key is found or the tree is out of keys. 412 412 */ 413 413 int ··· 536 536 * @node_off: Pointer to offset of current node within datastream. Modified 537 537 * by the function. 538 538 * 539 - * Helper function for btree traverse. Moves the current position to the 539 + * Helper function for btree traverse. Moves the current position to the 540 540 * start of the first leaf node. 541 541 * 542 542 * Also checks for an empty tree. If there are no keys, returns BEFS_BT_EMPTY. ··· 592 592 } 593 593 594 594 /** 595 - * befs_leafnode - Determine if the btree node is a leaf node or an 595 + * befs_leafnode - Determine if the btree node is a leaf node or an 596 596 * interior node 597 597 * @node: Pointer to node structure to test 598 - * 598 + * 599 599 * Return 1 if leaf, 0 if interior 600 600 */ 601 601 static int ··· 656 656 * @node: Pointer to the node structure to find the keydata array within 657 657 * 658 658 * Returns a pointer to the start of the keydata array 659 - * of the node pointed to by the node header 659 + * of the node pointed to by the node header 660 660 */ 661 661 static char * 662 662 befs_bt_keydata(struct befs_btree_node *node) ··· 702 702 703 703 /** 704 704 * befs_compare_strings - compare two strings 705 - * @key1: pointer to the first key to be compared 705 + * @key1: pointer to the first key to be compared 706 706 * @keylen1: length in bytes of key1 707 707 * @key2: pointer to the second key to be compared 708 708 * @keylen2: length in bytes of key2
+1 -1
fs/befs/btree.h
··· 1 1 /* 2 2 * btree.h 3 - * 3 + * 4 4 */ 5 5 6 6 int befs_btree_find(struct super_block *sb, const befs_data_stream *ds,
+3 -3
fs/befs/datastream.c
··· 84 84 * 85 85 * Takes a file position and gives back a brun who's starting block 86 86 * is block number fblock of the file. 87 - * 87 + * 88 88 * Returns BEFS_OK or BEFS_ERR. 89 - * 89 + * 90 90 * Calls specialized functions for each of the three possible 91 91 * datastream regions. 92 92 */ ··· 118 118 119 119 /** 120 120 * befs_read_lsmylink - read long symlink from datastream. 121 - * @sb: Filesystem superblock 121 + * @sb: Filesystem superblock 122 122 * @ds: Datastream to read from 123 123 * @buff: Buffer in which to place long symlink data 124 124 * @len: Length of the long symlink in bytes
+1 -1
fs/befs/inode.h
··· 1 1 /* 2 2 * inode.h 3 - * 3 + * 4 4 */ 5 5 6 6 int befs_check_inode(struct super_block *sb, befs_inode *raw_inode,
-1
fs/befs/io.h
··· 4 4 5 5 struct buffer_head *befs_bread_iaddr(struct super_block *sb, 6 6 befs_inode_addr iaddr); 7 -
+16 -16
fs/befs/linuxvfs.c
··· 84 84 .readpage = befs_symlink_readpage, 85 85 }; 86 86 87 - /* 87 + /* 88 88 * Called by generic_file_read() to read a page of data 89 - * 89 + * 90 90 * In turn, simply calls a generic block read function and 91 91 * passes it the address of befs_get_block, for mapping file 92 92 * positions to disk blocks. ··· 103 103 return generic_block_bmap(mapping, block, befs_get_block); 104 104 } 105 105 106 - /* 107 - * Generic function to map a file position (block) to a 106 + /* 107 + * Generic function to map a file position (block) to a 108 108 * disk offset (passed back in bh_result). 109 109 * 110 110 * Used by many higher level functions. ··· 337 337 /* 338 338 * set uid and gid. But since current BeOS is single user OS, so 339 339 * you can change by "uid" or "gid" options. 340 - */ 340 + */ 341 341 342 342 inode->i_uid = befs_sb->mount_opts.use_uid ? 343 343 befs_sb->mount_opts.uid : ··· 352 352 * BEFS's time is 64 bits, but current VFS is 32 bits... 353 353 * BEFS don't have access time. Nor inode change time. VFS 354 354 * doesn't have creation time. 355 - * Also, the lower 16 bits of the last_modified_time and 355 + * Also, the lower 16 bits of the last_modified_time and 356 356 * create_time are just a counter to help ensure uniqueness 357 357 * for indexing purposes. (PFD, page 54) 358 358 */ 359 359 360 360 inode->i_mtime.tv_sec = 361 361 fs64_to_cpu(sb, raw_inode->last_modified_time) >> 16; 362 - inode->i_mtime.tv_nsec = 0; /* lower 16 bits are not a time */ 362 + inode->i_mtime.tv_nsec = 0; /* lower 16 bits are not a time */ 363 363 inode->i_ctime = inode->i_mtime; 364 364 inode->i_atime = inode->i_mtime; 365 365 ··· 441 441 } 442 442 443 443 /* Called at fs teardown. 444 - * 444 + * 445 445 * Taken from NFS implementation by Al Viro. 446 446 */ 447 447 static void ··· 491 491 492 492 /* 493 493 * UTF-8 to NLS charset convert routine 494 - * 494 + * 495 495 * Uses uni2char() / char2uni() rather than the nls tables directly 496 496 */ 497 497 static int ··· 556 556 * @in_len: Length of input string in bytes 557 557 * @out: The output string in UTF-8 format 558 558 * @out_len: Length of the output buffer 559 - * 559 + * 560 560 * Converts input string @in, which is in the format of the loaded NLS map, 561 561 * into a utf8 string. 562 - * 562 + * 563 563 * The destination string @out is allocated by this function and the caller is 564 564 * responsible for freeing it with kfree() 565 - * 565 + * 566 566 * On return, *@out_len is the length of @out in bytes. 567 567 * 568 568 * On success, the return value is the number of utf8 characters written to 569 569 * the output buffer @out. 570 - * 570 + * 571 571 * On Failure, a negative number coresponding to the error code is returned. 572 572 */ 573 573 ··· 719 719 } 720 720 721 721 /* This function has the responsibiltiy of getting the 722 - * filesystem ready for unmounting. 722 + * filesystem ready for unmounting. 723 723 * Basically, we free everything that we allocated in 724 724 * befs_read_inode 725 725 */ ··· 780 780 * Linux 2.4.10 and later refuse to read blocks smaller than 781 781 * the logical block size for the device. But we also need to read at 782 782 * least 1k to get the second 512 bytes of the volume. 783 - */ 783 + */ 784 784 blocksize = sb_min_blocksize(sb, 1024); 785 785 if (!blocksize) { 786 786 if (!silent) ··· 917 917 .name = "befs", 918 918 .mount = befs_mount, 919 919 .kill_sb = kill_block_super, 920 - .fs_flags = FS_REQUIRES_DEV, 920 + .fs_flags = FS_REQUIRES_DEV, 921 921 }; 922 922 MODULE_ALIAS_FS("befs"); 923 923