arm: imx: tx6: mfgtool defconfig

[karo-tx-linux.git] / fs / reiserfs / namei.c

diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index 6bc38de8357fcdd337dee7d1d55cf6150333d527..cd11358b10c7a1e427394f78ca8334e67f3c9467 100644 (file)
--- 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)
 static inline void set_de_object_key(struct reiserfs_dir_entry *de)
 {
        BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih));
-       de->de_dir_id = deh_dir_id(&(de->de_deh[de->de_entry_num]));
-       de->de_objectid = deh_objectid(&(de->de_deh[de->de_entry_num]));
+       de->de_dir_id = deh_dir_id(&de->de_deh[de->de_entry_num]);
+       de->de_objectid = deh_objectid(&de->de_deh[de->de_entry_num]);
 }
 
 static 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)
            le32_to_cpu(de->de_ih->ih_key.k_dir_id);
        de->de_entry_key.on_disk_key.k_objectid =
            le32_to_cpu(de->de_ih->ih_key.k_objectid);
-       set_cpu_key_k_offset(&(de->de_entry_key), deh_offset(deh));
-       set_cpu_key_k_type(&(de->de_entry_key), TYPE_DIRENTRY);
+       set_cpu_key_k_offset(&de->de_entry_key, deh_offset(deh));
+       set_cpu_key_k_type(&de->de_entry_key, TYPE_DIRENTRY);
 }
 
 /*
@@ -149,7 +149,7 @@ int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
 
 #ifdef CONFIG_REISERFS_CHECK
        if (!is_direntry_le_ih(de->de_ih) ||
-           COMP_SHORT_KEYS(&(de->de_ih->ih_key), key)) {
+           COMP_SHORT_KEYS(&de->de_ih->ih_key, key)) {
                print_block(de->de_bh, 0, -1, -1);
                reiserfs_panic(sb, "vs-7005", "found item %h is not directory "
                               "item or does not belong to the same directory "
@@ -369,7 +369,7 @@ static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry,
        pathrelse(&path_to_entry);
        if (retval == NAME_FOUND) {
                inode = reiserfs_iget(dir->i_sb,
-                                     (struct cpu_key *)&(de.de_dir_id));
+                                     (struct cpu_key *)&de.de_dir_id);
                if (!inode || IS_ERR(inode)) {
                        reiserfs_write_unlock(dir->i_sb);
                        return ERR_PTR(-EACCES);
@@ -414,7 +414,7 @@ struct dentry *reiserfs_get_parent(struct dentry *child)
                reiserfs_write_unlock(dir->i_sb);
                return ERR_PTR(-ENOENT);
        }
-       inode = reiserfs_iget(dir->i_sb, (struct cpu_key *)&(de.de_dir_id));
+       inode = reiserfs_iget(dir->i_sb, (struct cpu_key *)&de.de_dir_id);
        reiserfs_write_unlock(dir->i_sb);
 
        return d_obtain_alias(inode);
@@ -672,7 +672,7 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, umode_t mod
                int err;
                drop_nlink(inode);
                reiserfs_update_sd(&th, inode);
-               err = journal_end(&th, dir->i_sb, jbegin_count);
+               err = journal_end(&th);
                if (err)
                        retval = err;
                unlock_new_inode(inode);
@@ -684,9 +684,9 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, umode_t mod
 
        unlock_new_inode(inode);
        d_instantiate(dentry, inode);
-       retval = journal_end(&th, dir->i_sb, jbegin_count);
+       retval = journal_end(&th);
 
-      out_failed:
+out_failed:
        reiserfs_write_unlock(dir->i_sb);
        return retval;
 }
@@ -755,7 +755,7 @@ static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode
                int err;
                drop_nlink(inode);
                reiserfs_update_sd(&th, inode);
-               err = journal_end(&th, dir->i_sb, jbegin_count);
+               err = journal_end(&th);
                if (err)
                        retval = err;
                unlock_new_inode(inode);
@@ -765,9 +765,9 @@ static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode
 
        unlock_new_inode(inode);
        d_instantiate(dentry, inode);
-       retval = journal_end(&th, dir->i_sb, jbegin_count);
+       retval = journal_end(&th);
 
-      out_failed:
+out_failed:
        reiserfs_write_unlock(dir->i_sb);
        return retval;
 }
@@ -847,7 +847,7 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
                clear_nlink(inode);
                DEC_DIR_INODE_NLINK(dir);
                reiserfs_update_sd(&th, inode);
-               err = journal_end(&th, dir->i_sb, jbegin_count);
+               err = journal_end(&th);
                if (err)
                        retval = err;
                unlock_new_inode(inode);
@@ -859,7 +859,7 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
 
        unlock_new_inode(inode);
        d_instantiate(dentry, inode);
-       retval = journal_end(&th, dir->i_sb, jbegin_count);
+       retval = journal_end(&th);
 out_failed:
        reiserfs_write_unlock(dir->i_sb);
        return retval;
@@ -935,7 +935,8 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
        }
 
        /* cut entry from dir directory */
-       retval = reiserfs_cut_from_item(&th, &path, &(de.de_entry_key), dir, NULL,      /* page */
+       retval = reiserfs_cut_from_item(&th, &path, &de.de_entry_key,
+                                       dir, NULL,      /* page */
                                        0 /*new file size - not used here */ );
        if (retval < 0)
                goto end_rmdir;
@@ -956,20 +957,20 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
        /* prevent empty directory from getting lost */
        add_save_link(&th, inode, 0 /* not truncate */ );
 
-       retval = journal_end(&th, dir->i_sb, jbegin_count);
+       retval = journal_end(&th);
        reiserfs_check_path(&path);
-      out_rmdir:
+out_rmdir:
        reiserfs_write_unlock(dir->i_sb);
        return retval;
 
-      end_rmdir:
+end_rmdir:
        /*
         * we must release path, because we did not call
         * reiserfs_cut_from_item, or reiserfs_cut_from_item does not
         * release path if operation was not complete
         */
        pathrelse(&path);
-       err = journal_end(&th, dir->i_sb, jbegin_count);
+       err = journal_end(&th);
        reiserfs_write_unlock(dir->i_sb);
        return err ? err : retval;
 }
@@ -1042,7 +1043,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
        savelink = inode->i_nlink;
 
        retval =
-           reiserfs_cut_from_item(&th, &path, &(de.de_entry_key), dir, NULL,
+           reiserfs_cut_from_item(&th, &path, &de.de_entry_key, dir, NULL,
                                   0);
        if (retval < 0) {
                inc_nlink(inode);
@@ -1059,18 +1060,18 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
                /* prevent file from getting lost */
                add_save_link(&th, inode, 0 /* not truncate */ );
 
-       retval = journal_end(&th, dir->i_sb, jbegin_count);
+       retval = journal_end(&th);
        reiserfs_check_path(&path);
        reiserfs_write_unlock(dir->i_sb);
        return retval;
 
-      end_unlink:
+end_unlink:
        pathrelse(&path);
-       err = journal_end(&th, dir->i_sb, jbegin_count);
+       err = journal_end(&th);
        reiserfs_check_path(&path);
        if (err)
                retval = err;
-      out_unlink:
+out_unlink:
        reiserfs_write_unlock(dir->i_sb);
        return retval;
 }
@@ -1153,7 +1154,7 @@ static int reiserfs_symlink(struct inode *parent_dir,
                int err;
                drop_nlink(inode);
                reiserfs_update_sd(&th, inode);
-               err = journal_end(&th, parent_dir->i_sb, jbegin_count);
+               err = journal_end(&th);
                if (err)
                        retval = err;
                unlock_new_inode(inode);
@@ -1163,8 +1164,8 @@ static int reiserfs_symlink(struct inode *parent_dir,
 
        unlock_new_inode(inode);
        d_instantiate(dentry, inode);
-       retval = journal_end(&th, parent_dir->i_sb, jbegin_count);
-      out_failed:
+       retval = journal_end(&th);
+out_failed:
        reiserfs_write_unlock(parent_dir->i_sb);
        return retval;
 }
@@ -1213,7 +1214,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,
        if (retval) {
                int err;
                drop_nlink(inode);
-               err = journal_end(&th, dir->i_sb, jbegin_count);
+               err = journal_end(&th);
                reiserfs_write_unlock(dir->i_sb);
                return err ? err : retval;
        }
@@ -1223,7 +1224,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,
 
        ihold(inode);
        d_instantiate(dentry, inode);
-       retval = journal_end(&th, dir->i_sb, jbegin_count);
+       retval = journal_end(&th);
        reiserfs_write_unlock(dir->i_sb);
        return retval;
 }
@@ -1385,7 +1386,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                                       "new entry is found, new inode == 0");
                }
        } else if (retval) {
-               int err = journal_end(&th, old_dir->i_sb, jbegin_count);
+               int err = journal_end(&th);
                reiserfs_write_unlock(old_dir->i_sb);
                return err ? err : retval;
        }
@@ -1412,7 +1413,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                                         &old_entry_path,
                                         &old_de)) != NAME_FOUND) {
                        pathrelse(&old_entry_path);
-                       journal_end(&th, old_dir->i_sb, jbegin_count);
+                       journal_end(&th);
                        reiserfs_write_unlock(old_dir->i_sb);
                        return -EIO;
                }
@@ -1436,7 +1437,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                if (retval != NAME_FOUND_INVISIBLE && retval != NAME_FOUND) {
                        pathrelse(&new_entry_path);
                        pathrelse(&old_entry_path);
-                       journal_end(&th, old_dir->i_sb, jbegin_count);
+                       journal_end(&th);
                        reiserfs_write_unlock(old_dir->i_sb);
                        return -EIO;
                }
@@ -1454,7 +1455,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                                pathrelse(&dot_dot_entry_path);
                                pathrelse(&new_entry_path);
                                pathrelse(&old_entry_path);
-                               journal_end(&th, old_dir->i_sb, jbegin_count);
+                               journal_end(&th);
                                reiserfs_write_unlock(old_dir->i_sb);
                                return -EIO;
                        }
@@ -1531,10 +1532,10 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 
        mark_de_visible(new_de.de_deh + new_de.de_entry_num);
        set_ino_in_dir_entry(&new_de, INODE_PKEY(old_inode));
-       journal_mark_dirty(&th, old_dir->i_sb, new_de.de_bh);
+       journal_mark_dirty(&th, new_de.de_bh);
 
        mark_de_hidden(old_de.de_deh + old_de.de_entry_num);
-       journal_mark_dirty(&th, old_dir->i_sb, old_de.de_bh);
+       journal_mark_dirty(&th, old_de.de_bh);
        ctime = CURRENT_TIME_SEC;
        old_dir->i_ctime = old_dir->i_mtime = ctime;
        new_dir->i_ctime = new_dir->i_mtime = ctime;
@@ -1558,7 +1559,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        if (S_ISDIR(old_inode_mode)) {
                /* adjust ".." of renamed directory */
                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, dot_dot_de.de_bh);
 
                /*
                 * there (in new_dir) was no directory, so it got new link
@@ -1583,7 +1584,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         * entry. This needs one more clean up
         */
        if (reiserfs_cut_from_item
-           (&th, &old_entry_path, &(old_de.de_entry_key), old_dir, NULL,
+           (&th, &old_entry_path, &old_de.de_entry_key, old_dir, NULL,
             0) < 0)
                reiserfs_error(old_dir->i_sb, "vs-7060",
                               "couldn't not cut old name. Fsck later?");
@@ -1601,7 +1602,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                reiserfs_update_sd(&th, new_dentry_inode);
        }
 
-       retval = journal_end(&th, old_dir->i_sb, jbegin_count);
+       retval = journal_end(&th);
        reiserfs_write_unlock(old_dir->i_sb);
        return retval;
 }