[PATCH] switch all filesystems over to d_obtain_alias

[linux-2.6-omap-h63xx.git] / fs / ext2 / namei.c

diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index ad1432a2a62ee85eeef7bfaea49d142c1161af08..a1b328ab1e55d52877fb814db852d74f019533e7 100644 (file)
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -36,22 +36,6 @@
 #include "acl.h"
 #include "xip.h"
 
-/*
- * Couple of helper functions - make the code slightly cleaner.
- */
-
-static inline void ext2_inc_count(struct inode *inode)
-{
-       inode->i_nlink++;
-       mark_inode_dirty(inode);
-}
-
-static inline void ext2_dec_count(struct inode *inode)
-{
-       inode->i_nlink--;
-       mark_inode_dirty(inode);
-}
-
 static inline int ext2_add_nondir(struct dentry *dentry, struct inode *inode)
 {
        int err = ext2_add_link(dentry, inode);
@@ -59,7 +43,7 @@ static inline int ext2_add_nondir(struct dentry *dentry, struct inode *inode)
                d_instantiate(dentry, inode);
                return 0;
        }
-       ext2_dec_count(inode);
+       inode_dec_link_count(inode);
        iput(inode);
        return err;
 }
@@ -79,9 +63,9 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
        ino = ext2_inode_by_name(dir, dentry);
        inode = NULL;
        if (ino) {
-               inode = iget(dir->i_sb, ino);
-               if (!inode)
-                       return ERR_PTR(-EACCES);
+               inode = ext2_iget(dir->i_sb, ino);
+               if (IS_ERR(inode))
+                       return ERR_CAST(inode);
        }
        return d_splice_alias(inode, dentry);
 }
@@ -89,8 +73,6 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
 struct dentry *ext2_get_parent(struct dentry *child)
 {
        unsigned long ino;
-       struct dentry *parent;
-       struct inode *inode;
        struct dentry dotdot;
 
        dotdot.d_name.name = "..";
@@ -99,16 +81,7 @@ struct dentry *ext2_get_parent(struct dentry *child)
        ino = ext2_inode_by_name(child->d_inode, &dotdot);
        if (!ino)
                return ERR_PTR(-ENOENT);
-       inode = iget(child->d_inode->i_sb, ino);
-
-       if (!inode)
-               return ERR_PTR(-EACCES);
-       parent = d_alloc_anon(inode);
-       if (!parent) {
-               iput(inode);
-               parent = ERR_PTR(-ENOMEM);
-       }
-       return parent;
+       return d_obtain_alias(ext2_iget(child->d_inode->i_sb, ino));
 } 
 
 /*
@@ -201,7 +174,7 @@ out:
        return err;
 
 out_fail:
-       ext2_dec_count(inode);
+       inode_dec_link_count(inode);
        iput (inode);
        goto out;
 }
@@ -215,7 +188,7 @@ static int ext2_link (struct dentry * old_dentry, struct inode * dir,
                return -EMLINK;
 
        inode->i_ctime = CURRENT_TIME_SEC;
-       ext2_inc_count(inode);
+       inode_inc_link_count(inode);
        atomic_inc(&inode->i_count);
 
        return ext2_add_nondir(dentry, inode);
@@ -229,7 +202,7 @@ static int ext2_mkdir(struct inode * dir, struct dentry * dentry, int mode)
        if (dir->i_nlink >= EXT2_LINK_MAX)
                goto out;
 
-       ext2_inc_count(dir);
+       inode_inc_link_count(dir);
 
        inode = ext2_new_inode (dir, S_IFDIR | mode);
        err = PTR_ERR(inode);
@@ -243,7 +216,7 @@ static int ext2_mkdir(struct inode * dir, struct dentry * dentry, int mode)
        else
                inode->i_mapping->a_ops = &ext2_aops;
 
-       ext2_inc_count(inode);
+       inode_inc_link_count(inode);
 
        err = ext2_make_empty(inode, dir);
        if (err)
@@ -258,11 +231,11 @@ out:
        return err;
 
 out_fail:
-       ext2_dec_count(inode);
-       ext2_dec_count(inode);
+       inode_dec_link_count(inode);
+       inode_dec_link_count(inode);
        iput(inode);
 out_dir:
-       ext2_dec_count(dir);
+       inode_dec_link_count(dir);
        goto out;
 }
 
@@ -282,7 +255,7 @@ static int ext2_unlink(struct inode * dir, struct dentry *dentry)
                goto out;
 
        inode->i_ctime = dir->i_ctime;
-       ext2_dec_count(inode);
+       inode_dec_link_count(inode);
        err = 0;
 out:
        return err;
@@ -297,8 +270,8 @@ static int ext2_rmdir (struct inode * dir, struct dentry *dentry)
                err = ext2_unlink(dir, dentry);
                if (!err) {
                        inode->i_size = 0;
-                       ext2_dec_count(inode);
-                       ext2_dec_count(dir);
+                       inode_dec_link_count(inode);
+                       inode_dec_link_count(dir);
                }
        }
        return err;
@@ -338,41 +311,41 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
                new_de = ext2_find_entry (new_dir, new_dentry, &new_page);
                if (!new_de)
                        goto out_dir;
-               ext2_inc_count(old_inode);
+               inode_inc_link_count(old_inode);
                ext2_set_link(new_dir, new_de, new_page, old_inode);
                new_inode->i_ctime = CURRENT_TIME_SEC;
                if (dir_de)
-                       new_inode->i_nlink--;
-               ext2_dec_count(new_inode);
+                       drop_nlink(new_inode);
+               inode_dec_link_count(new_inode);
        } else {
                if (dir_de) {
                        err = -EMLINK;
                        if (new_dir->i_nlink >= EXT2_LINK_MAX)
                                goto out_dir;
                }
-               ext2_inc_count(old_inode);
+               inode_inc_link_count(old_inode);
                err = ext2_add_link(new_dentry, old_inode);
                if (err) {
-                       ext2_dec_count(old_inode);
+                       inode_dec_link_count(old_inode);
                        goto out_dir;
                }
                if (dir_de)
-                       ext2_inc_count(new_dir);
+                       inode_inc_link_count(new_dir);
        }
 
        /*
         * Like most other Unix systems, set the ctime for inodes on a
         * rename.
-        * ext2_dec_count() will mark the inode dirty.
+        * inode_dec_link_count() will mark the inode dirty.
         */
        old_inode->i_ctime = CURRENT_TIME_SEC;
 
        ext2_delete_entry (old_de, old_page);
-       ext2_dec_count(old_inode);
+       inode_dec_link_count(old_inode);
 
        if (dir_de) {
                ext2_set_link(old_inode, dir_de, dir_page, new_dir);
-               ext2_dec_count(old_dir);
+               inode_dec_link_count(old_dir);
        }
        return 0;
 
@@ -389,7 +362,7 @@ out:
        return err;
 }
 
-struct inode_operations ext2_dir_inode_operations = {
+const struct inode_operations ext2_dir_inode_operations = {
        .create         = ext2_create,
        .lookup         = ext2_lookup,
        .link           = ext2_link,
@@ -409,7 +382,7 @@ struct inode_operations ext2_dir_inode_operations = {
        .permission     = ext2_permission,
 };
 
-struct inode_operations ext2_special_inode_operations = {
+const struct inode_operations ext2_special_inode_operations = {
 #ifdef CONFIG_EXT2_FS_XATTR
        .setxattr       = generic_setxattr,
        .getxattr       = generic_getxattr,