aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/namei.c
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2009-03-30 14:02:44 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 15:16:39 -0400
commit0222e6571c332563a48d4cf5487b67feabe60b5e (patch)
tree44829ca0a4b1343edec08d4f70696cb0d3218975 /fs/reiserfs/namei.c
parent3cd6dbe6feb9b32347e6c6f25a27f0cde9d50418 (diff)
reiserfs: strip trailing whitespace
This patch strips trailing whitespace from the reiserfs code. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs/namei.c')
-rw-r--r--fs/reiserfs/namei.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index cb1a9e977907..9d1070e741fc 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -106,7 +106,7 @@ key of the first directory entry in it.
106This function first calls search_by_key, then, if item whose first 106This function first calls search_by_key, then, if item whose first
107entry matches is not found it looks for the entry inside directory 107entry matches is not found it looks for the entry inside directory
108item found by search_by_key. Fills the path to the entry, and to the 108item found by search_by_key. Fills the path to the entry, and to the
109entry position in the item 109entry position in the item
110 110
111*/ 111*/
112 112
@@ -371,7 +371,7 @@ static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry,
371 return d_splice_alias(inode, dentry); 371 return d_splice_alias(inode, dentry);
372} 372}
373 373
374/* 374/*
375** looks up the dentry of the parent directory for child. 375** looks up the dentry of the parent directory for child.
376** taken from ext2_get_parent 376** taken from ext2_get_parent
377*/ 377*/
@@ -401,7 +401,7 @@ struct dentry *reiserfs_get_parent(struct dentry *child)
401 return d_obtain_alias(inode); 401 return d_obtain_alias(inode);
402} 402}
403 403
404/* add entry to the directory (entry can be hidden). 404/* add entry to the directory (entry can be hidden).
405 405
406insert definition of when hidden directories are used here -Hans 406insert definition of when hidden directories are used here -Hans
407 407
@@ -559,7 +559,7 @@ static int drop_new_inode(struct inode *inode)
559 return 0; 559 return 0;
560} 560}
561 561
562/* utility function that does setup for reiserfs_new_inode. 562/* utility function that does setup for reiserfs_new_inode.
563** DQUOT_INIT needs lots of credits so it's better to have it 563** DQUOT_INIT needs lots of credits so it's better to have it
564** outside of a transaction, so we had to pull some bits of 564** outside of a transaction, so we had to pull some bits of
565** reiserfs_new_inode out into this func. 565** reiserfs_new_inode out into this func.
@@ -820,7 +820,7 @@ static inline int reiserfs_empty_dir(struct inode *inode)
820{ 820{
821 /* we can cheat because an old format dir cannot have 821 /* we can cheat because an old format dir cannot have
822 ** EMPTY_DIR_SIZE, and a new format dir cannot have 822 ** EMPTY_DIR_SIZE, and a new format dir cannot have
823 ** EMPTY_DIR_SIZE_V1. So, if the inode is either size, 823 ** EMPTY_DIR_SIZE_V1. So, if the inode is either size,
824 ** regardless of disk format version, the directory is empty. 824 ** regardless of disk format version, the directory is empty.
825 */ 825 */
826 if (inode->i_size != EMPTY_DIR_SIZE && 826 if (inode->i_size != EMPTY_DIR_SIZE &&
@@ -1162,7 +1162,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,
1162 return retval; 1162 return retval;
1163} 1163}
1164 1164
1165// de contains information pointing to an entry which 1165/* de contains information pointing to an entry which */
1166static int de_still_valid(const char *name, int len, 1166static int de_still_valid(const char *name, int len,
1167 struct reiserfs_dir_entry *de) 1167 struct reiserfs_dir_entry *de)
1168{ 1168{
@@ -1206,10 +1206,10 @@ static void set_ino_in_dir_entry(struct reiserfs_dir_entry *de,
1206 de->de_deh[de->de_entry_num].deh_objectid = key->k_objectid; 1206 de->de_deh[de->de_entry_num].deh_objectid = key->k_objectid;
1207} 1207}
1208 1208
1209/* 1209/*
1210 * process, that is going to call fix_nodes/do_balance must hold only 1210 * process, that is going to call fix_nodes/do_balance must hold only
1211 * one path. If it holds 2 or more, it can get into endless waiting in 1211 * one path. If it holds 2 or more, it can get into endless waiting in
1212 * get_empty_nodes or its clones 1212 * get_empty_nodes or its clones
1213 */ 1213 */
1214static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry, 1214static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1215 struct inode *new_dir, struct dentry *new_dentry) 1215 struct inode *new_dir, struct dentry *new_dentry)
@@ -1263,7 +1263,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1263 1263
1264 old_inode_mode = old_inode->i_mode; 1264 old_inode_mode = old_inode->i_mode;
1265 if (S_ISDIR(old_inode_mode)) { 1265 if (S_ISDIR(old_inode_mode)) {
1266 // make sure, that directory being renamed has correct ".." 1266 // make sure, that directory being renamed has correct ".."
1267 // and that its new parent directory has not too many links 1267 // and that its new parent directory has not too many links
1268 // already 1268 // already
1269 1269
@@ -1274,8 +1274,8 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1274 } 1274 }
1275 } 1275 }
1276 1276
1277 /* directory is renamed, its parent directory will be changed, 1277 /* directory is renamed, its parent directory will be changed,
1278 ** so find ".." entry 1278 ** so find ".." entry
1279 */ 1279 */
1280 dot_dot_de.de_gen_number_bit_string = NULL; 1280 dot_dot_de.de_gen_number_bit_string = NULL;
1281 retval = 1281 retval =
@@ -1385,9 +1385,9 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1385 this stuff, yes? Then, having 1385 this stuff, yes? Then, having
1386 gathered everything into RAM we 1386 gathered everything into RAM we
1387 should lock the buffers, yes? -Hans */ 1387 should lock the buffers, yes? -Hans */
1388 /* probably. our rename needs to hold more 1388 /* probably. our rename needs to hold more
1389 ** than one path at once. The seals would 1389 ** than one path at once. The seals would
1390 ** have to be written to deal with multi-path 1390 ** have to be written to deal with multi-path
1391 ** issues -chris 1391 ** issues -chris
1392 */ 1392 */
1393 /* sanity checking before doing the rename - avoid races many 1393 /* sanity checking before doing the rename - avoid races many
@@ -1465,7 +1465,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1465 } 1465 }
1466 1466
1467 if (S_ISDIR(old_inode_mode)) { 1467 if (S_ISDIR(old_inode_mode)) {
1468 // adjust ".." of renamed directory 1468 /* adjust ".." of renamed directory */
1469 set_ino_in_dir_entry(&dot_dot_de, INODE_PKEY(new_dir)); 1469 set_ino_in_dir_entry(&dot_dot_de, INODE_PKEY(new_dir));
1470 journal_mark_dirty(&th, new_dir->i_sb, dot_dot_de.de_bh); 1470 journal_mark_dirty(&th, new_dir->i_sb, dot_dot_de.de_bh);
1471 1471