sh: switch sh4-202 to clkdev

[safe/jmp/linux-2.6] / fs / nilfs2 / namei.c

diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
index 4237722..ad6ed2c 100644 (file)
--- a/fs/nilfs2/namei.c
+++ b/fs/nilfs2/namei.c
@@ -67,7 +67,7 @@ nilfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
        if (dentry->d_name.len > NILFS_NAME_LEN)
                return ERR_PTR(-ENAMETOOLONG);
 
-       ino = nilfs_inode_by_name(dir, dentry);
+       ino = nilfs_inode_by_name(dir, &dentry->d_name);
        inode = NULL;
        if (ino) {
                inode = nilfs_iget(dir->i_sb, ino);
@@ -81,10 +81,7 @@ struct dentry *nilfs_get_parent(struct dentry *child)
 {
        unsigned long ino;
        struct inode *inode;
-       struct dentry dotdot;
-
-       dotdot.d_name.name = "..";
-       dotdot.d_name.len = 2;
+       struct qstr dotdot = {.name = "..", .len = 2};
 
        ino = nilfs_inode_by_name(child->d_inode, &dotdot);
        if (!ino)
@@ -120,7 +117,7 @@ static int nilfs_create(struct inode *dir, struct dentry *dentry, int mode,
                inode->i_op = &nilfs_file_inode_operations;
                inode->i_fop = &nilfs_file_operations;
                inode->i_mapping->a_ops = &nilfs_aops;
-               mark_inode_dirty(inode);
+               nilfs_mark_inode_dirty(inode);
                err = nilfs_add_nondir(dentry, inode);
        }
        if (!err)
@@ -148,7 +145,7 @@ nilfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
        err = PTR_ERR(inode);
        if (!IS_ERR(inode)) {
                init_special_inode(inode, inode->i_mode, rdev);
-               mark_inode_dirty(inode);
+               nilfs_mark_inode_dirty(inode);
                err = nilfs_add_nondir(dentry, inode);
        }
        if (!err)
@@ -201,7 +198,7 @@ out:
 
 out_fail:
        drop_nlink(inode);
-       mark_inode_dirty(inode);
+       nilfs_mark_inode_dirty(inode);
        iput(inode);
        goto out;
 }
@@ -267,7 +264,7 @@ static int nilfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        if (err)
                goto out_fail;
 
-       mark_inode_dirty(inode);
+       nilfs_mark_inode_dirty(inode);
        d_instantiate(dentry, inode);
 out:
        if (!err)
@@ -280,11 +277,11 @@ out:
 out_fail:
        drop_nlink(inode);
        drop_nlink(inode);
-       mark_inode_dirty(inode);
+       nilfs_mark_inode_dirty(inode);
        iput(inode);
 out_dir:
        drop_nlink(dir);
-       mark_inode_dirty(dir);
+       nilfs_mark_inode_dirty(dir);
        goto out;
 }
 
@@ -296,7 +293,7 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry)
        int err;
 
        err = -ENOENT;
-       de = nilfs_find_entry(dir, dentry, &page);
+       de = nilfs_find_entry(dir, &dentry->d_name, &page);
        if (!de)
                goto out;
 
@@ -334,8 +331,8 @@ static int nilfs_unlink(struct inode *dir, struct dentry *dentry)
        err = nilfs_do_unlink(dir, dentry);
 
        if (!err) {
-               mark_inode_dirty(dir);
-               mark_inode_dirty(dentry->d_inode);
+               nilfs_mark_inode_dirty(dir);
+               nilfs_mark_inode_dirty(dentry->d_inode);
                err = nilfs_transaction_commit(dir->i_sb);
        } else
                nilfs_transaction_abort(dir->i_sb);
@@ -359,9 +356,9 @@ static int nilfs_rmdir(struct inode *dir, struct dentry *dentry)
                if (!err) {
                        inode->i_size = 0;
                        drop_nlink(inode);
-                       mark_inode_dirty(inode);
+                       nilfs_mark_inode_dirty(inode);
                        drop_nlink(dir);
-                       mark_inode_dirty(dir);
+                       nilfs_mark_inode_dirty(dir);
                }
        }
        if (!err)
@@ -389,7 +386,7 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                return err;
 
        err = -ENOENT;
-       old_de = nilfs_find_entry(old_dir, old_dentry, &old_page);
+       old_de = nilfs_find_entry(old_dir, &old_dentry->d_name, &old_page);
        if (!old_de)
                goto out;
 
@@ -409,17 +406,17 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                        goto out_dir;
 
                err = -ENOENT;
-               new_de = nilfs_find_entry(new_dir, new_dentry, &new_page);
+               new_de = nilfs_find_entry(new_dir, &new_dentry->d_name, &new_page);
                if (!new_de)
                        goto out_dir;
                inc_nlink(old_inode);
                nilfs_set_link(new_dir, new_de, new_page, old_inode);
-               mark_inode_dirty(new_dir);
+               nilfs_mark_inode_dirty(new_dir);
                new_inode->i_ctime = CURRENT_TIME;
                if (dir_de)
                        drop_nlink(new_inode);
                drop_nlink(new_inode);
-               mark_inode_dirty(new_inode);
+               nilfs_mark_inode_dirty(new_inode);
        } else {
                if (dir_de) {
                        err = -EMLINK;
@@ -430,12 +427,12 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                err = nilfs_add_link(new_dentry, old_inode);
                if (err) {
                        drop_nlink(old_inode);
-                       mark_inode_dirty(old_inode);
+                       nilfs_mark_inode_dirty(old_inode);
                        goto out_dir;
                }
                if (dir_de) {
                        inc_nlink(new_dir);
-                       mark_inode_dirty(new_dir);
+                       nilfs_mark_inode_dirty(new_dir);
                }
        }
 
@@ -452,8 +449,8 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                nilfs_set_link(old_inode, dir_de, dir_page, new_dir);
                drop_nlink(old_dir);
        }
-       mark_inode_dirty(old_dir);
-       mark_inode_dirty(old_inode);
+       nilfs_mark_inode_dirty(old_dir);
+       nilfs_mark_inode_dirty(old_inode);
 
        err = nilfs_transaction_commit(old_dir->i_sb);
        return err;