aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/namei.c
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2014-04-23 10:00:42 -0400
committerJan Kara <jack@suse.cz>2014-05-06 17:18:16 -0400
commita228bf8f0a3e5f1406edbd61f7400e87e23af5f7 (patch)
tree44b6806245ad0c93f607c4df73ab7c26a404347d /fs/reiserfs/namei.c
parentcf776a7a4dafa330dd371a6a301ddf9e38747d93 (diff)
reiserfs: cleanup, remove unnecessary parens
The reiserfs code is littered with extra parens in places where the authors may not have been certain about precedence of & vs ->. This patch cleans them out. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/reiserfs/namei.c')
-rw-r--r--fs/reiserfs/namei.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index ebae36db94a0..cd11358b10c7 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -86,8 +86,8 @@ inline void set_de_name_and_namelen(struct reiserfs_dir_entry *de)
86static inline void set_de_object_key(struct reiserfs_dir_entry *de) 86static inline void set_de_object_key(struct reiserfs_dir_entry *de)
87{ 87{
88 BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih)); 88 BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih));
89 de->de_dir_id = deh_dir_id(&(de->de_deh[de->de_entry_num])); 89 de->de_dir_id = deh_dir_id(&de->de_deh[de->de_entry_num]);
90 de->de_objectid = deh_objectid(&(de->de_deh[de->de_entry_num])); 90 de->de_objectid = deh_objectid(&de->de_deh[de->de_entry_num]);
91} 91}
92 92
93static inline void store_de_entry_key(struct reiserfs_dir_entry *de) 93static inline void store_de_entry_key(struct reiserfs_dir_entry *de)
@@ -102,8 +102,8 @@ static inline void store_de_entry_key(struct reiserfs_dir_entry *de)
102 le32_to_cpu(de->de_ih->ih_key.k_dir_id); 102 le32_to_cpu(de->de_ih->ih_key.k_dir_id);
103 de->de_entry_key.on_disk_key.k_objectid = 103 de->de_entry_key.on_disk_key.k_objectid =
104 le32_to_cpu(de->de_ih->ih_key.k_objectid); 104 le32_to_cpu(de->de_ih->ih_key.k_objectid);
105 set_cpu_key_k_offset(&(de->de_entry_key), deh_offset(deh)); 105 set_cpu_key_k_offset(&de->de_entry_key, deh_offset(deh));
106 set_cpu_key_k_type(&(de->de_entry_key), TYPE_DIRENTRY); 106 set_cpu_key_k_type(&de->de_entry_key, TYPE_DIRENTRY);
107} 107}
108 108
109/* 109/*
@@ -149,7 +149,7 @@ int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
149 149
150#ifdef CONFIG_REISERFS_CHECK 150#ifdef CONFIG_REISERFS_CHECK
151 if (!is_direntry_le_ih(de->de_ih) || 151 if (!is_direntry_le_ih(de->de_ih) ||
152 COMP_SHORT_KEYS(&(de->de_ih->ih_key), key)) { 152 COMP_SHORT_KEYS(&de->de_ih->ih_key, key)) {
153 print_block(de->de_bh, 0, -1, -1); 153 print_block(de->de_bh, 0, -1, -1);
154 reiserfs_panic(sb, "vs-7005", "found item %h is not directory " 154 reiserfs_panic(sb, "vs-7005", "found item %h is not directory "
155 "item or does not belong to the same directory " 155 "item or does not belong to the same directory "
@@ -369,7 +369,7 @@ static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry,
369 pathrelse(&path_to_entry); 369 pathrelse(&path_to_entry);
370 if (retval == NAME_FOUND) { 370 if (retval == NAME_FOUND) {
371 inode = reiserfs_iget(dir->i_sb, 371 inode = reiserfs_iget(dir->i_sb,
372 (struct cpu_key *)&(de.de_dir_id)); 372 (struct cpu_key *)&de.de_dir_id);
373 if (!inode || IS_ERR(inode)) { 373 if (!inode || IS_ERR(inode)) {
374 reiserfs_write_unlock(dir->i_sb); 374 reiserfs_write_unlock(dir->i_sb);
375 return ERR_PTR(-EACCES); 375 return ERR_PTR(-EACCES);
@@ -414,7 +414,7 @@ struct dentry *reiserfs_get_parent(struct dentry *child)
414 reiserfs_write_unlock(dir->i_sb); 414 reiserfs_write_unlock(dir->i_sb);
415 return ERR_PTR(-ENOENT); 415 return ERR_PTR(-ENOENT);
416 } 416 }
417 inode = reiserfs_iget(dir->i_sb, (struct cpu_key *)&(de.de_dir_id)); 417 inode = reiserfs_iget(dir->i_sb, (struct cpu_key *)&de.de_dir_id);
418 reiserfs_write_unlock(dir->i_sb); 418 reiserfs_write_unlock(dir->i_sb);
419 419
420 return d_obtain_alias(inode); 420 return d_obtain_alias(inode);
@@ -935,7 +935,8 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
935 } 935 }
936 936
937 /* cut entry from dir directory */ 937 /* cut entry from dir directory */
938 retval = reiserfs_cut_from_item(&th, &path, &(de.de_entry_key), dir, NULL, /* page */ 938 retval = reiserfs_cut_from_item(&th, &path, &de.de_entry_key,
939 dir, NULL, /* page */
939 0 /*new file size - not used here */ ); 940 0 /*new file size - not used here */ );
940 if (retval < 0) 941 if (retval < 0)
941 goto end_rmdir; 942 goto end_rmdir;
@@ -1042,7 +1043,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
1042 savelink = inode->i_nlink; 1043 savelink = inode->i_nlink;
1043 1044
1044 retval = 1045 retval =
1045 reiserfs_cut_from_item(&th, &path, &(de.de_entry_key), dir, NULL, 1046 reiserfs_cut_from_item(&th, &path, &de.de_entry_key, dir, NULL,
1046 0); 1047 0);
1047 if (retval < 0) { 1048 if (retval < 0) {
1048 inc_nlink(inode); 1049 inc_nlink(inode);
@@ -1583,7 +1584,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1583 * entry. This needs one more clean up 1584 * entry. This needs one more clean up
1584 */ 1585 */
1585 if (reiserfs_cut_from_item 1586 if (reiserfs_cut_from_item
1586 (&th, &old_entry_path, &(old_de.de_entry_key), old_dir, NULL, 1587 (&th, &old_entry_path, &old_de.de_entry_key, old_dir, NULL,
1587 0) < 0) 1588 0) < 0)
1588 reiserfs_error(old_dir->i_sb, "vs-7060", 1589 reiserfs_error(old_dir->i_sb, "vs-7060",
1589 "couldn't not cut old name. Fsck later?"); 1590 "couldn't not cut old name. Fsck later?");