diff options
author | Theodore Ts'o <tytso@mit.edu> | 2010-05-17 07:00:00 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2010-05-17 07:00:00 -0400 |
commit | 60e6679e28518ccd67169c4a539d8cc7490eb8a6 (patch) | |
tree | 65f39d1e9da3006df5bc5532d0c8a7ec365599f0 /fs/ext4/namei.c | |
parent | 4d92dc0f00a775dc2e1267b0e00befb783902fe7 (diff) |
ext4: Drop whitespace at end of lines
This patch was generated using:
#!/usr/bin/perl -i
while (<>) {
s/[ ]+$//;
print;
}
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/namei.c')
-rw-r--r-- | fs/ext4/namei.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 7b4bf8feae4e..83be743c8d1f 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c | |||
@@ -187,7 +187,7 @@ unsigned int ext4_rec_len_from_disk(__le16 dlen, unsigned blocksize) | |||
187 | return blocksize; | 187 | return blocksize; |
188 | return (len & 65532) | ((len & 3) << 16); | 188 | return (len & 65532) | ((len & 3) << 16); |
189 | } | 189 | } |
190 | 190 | ||
191 | __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize) | 191 | __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize) |
192 | { | 192 | { |
193 | if ((len > blocksize) || (blocksize > (1 << 18)) || (len & 3)) | 193 | if ((len > blocksize) || (blocksize > (1 << 18)) || (len & 3)) |
@@ -197,7 +197,7 @@ __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize) | |||
197 | if (len == blocksize) { | 197 | if (len == blocksize) { |
198 | if (blocksize == 65536) | 198 | if (blocksize == 65536) |
199 | return cpu_to_le16(EXT4_MAX_REC_LEN); | 199 | return cpu_to_le16(EXT4_MAX_REC_LEN); |
200 | else | 200 | else |
201 | return cpu_to_le16(0); | 201 | return cpu_to_le16(0); |
202 | } | 202 | } |
203 | return cpu_to_le16((len & 65532) | ((len >> 16) & 3)); | 203 | return cpu_to_le16((len & 65532) | ((len >> 16) & 3)); |
@@ -349,7 +349,7 @@ struct stats dx_show_entries(struct dx_hash_info *hinfo, struct inode *dir, | |||
349 | brelse(bh); | 349 | brelse(bh); |
350 | } | 350 | } |
351 | if (bcount) | 351 | if (bcount) |
352 | printk(KERN_DEBUG "%snames %u, fullness %u (%u%%)\n", | 352 | printk(KERN_DEBUG "%snames %u, fullness %u (%u%%)\n", |
353 | levels ? "" : " ", names, space/bcount, | 353 | levels ? "" : " ", names, space/bcount, |
354 | (space/bcount)*100/blocksize); | 354 | (space/bcount)*100/blocksize); |
355 | return (struct stats) { names, space, bcount}; | 355 | return (struct stats) { names, space, bcount}; |
@@ -653,7 +653,7 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, | |||
653 | int ret, err; | 653 | int ret, err; |
654 | __u32 hashval; | 654 | __u32 hashval; |
655 | 655 | ||
656 | dxtrace(printk(KERN_DEBUG "In htree_fill_tree, start hash: %x:%x\n", | 656 | dxtrace(printk(KERN_DEBUG "In htree_fill_tree, start hash: %x:%x\n", |
657 | start_hash, start_minor_hash)); | 657 | start_hash, start_minor_hash)); |
658 | dir = dir_file->f_path.dentry->d_inode; | 658 | dir = dir_file->f_path.dentry->d_inode; |
659 | if (!(ext4_test_inode_flag(dir, EXT4_INODE_INDEX))) { | 659 | if (!(ext4_test_inode_flag(dir, EXT4_INODE_INDEX))) { |
@@ -1141,7 +1141,7 @@ dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count, | |||
1141 | unsigned rec_len = 0; | 1141 | unsigned rec_len = 0; |
1142 | 1142 | ||
1143 | while (count--) { | 1143 | while (count--) { |
1144 | struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) | 1144 | struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) |
1145 | (from + (map->offs<<2)); | 1145 | (from + (map->offs<<2)); |
1146 | rec_len = EXT4_DIR_REC_LEN(de->name_len); | 1146 | rec_len = EXT4_DIR_REC_LEN(de->name_len); |
1147 | memcpy (to, de, rec_len); | 1147 | memcpy (to, de, rec_len); |