Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index 88cecde..f39446b 100644 (file)
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -35,22 +35,7 @@
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.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);
-}
+#include "xip.h"
 
 static inline int ext2_add_nondir(struct dentry *dentry, struct inode *inode)
 {
@@ -59,7 +44,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;
 }
@@ -84,10 +69,7 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
                        return ERR_PTR(-EACCES);
                vx_propagate_xid(nd, inode);
        }
-       if (inode)
-               return d_splice_alias(inode, dentry);
-       d_add(dentry, inode);
-       return NULL;
+       return d_splice_alias(inode, dentry);
 }
 
 struct dentry *ext2_get_parent(struct dentry *child)
@@ -129,11 +111,16 @@ static int ext2_create (struct inode * dir, struct dentry * dentry, int mode, st
        int err = PTR_ERR(inode);
        if (!IS_ERR(inode)) {
                inode->i_op = &ext2_file_inode_operations;
-               inode->i_fop = &ext2_file_operations;
-               if (test_opt(inode->i_sb, NOBH))
+               if (ext2_use_xip(inode->i_sb)) {
+                       inode->i_mapping->a_ops = &ext2_aops_xip;
+                       inode->i_fop = &ext2_xip_file_operations;
+               } else if (test_opt(inode->i_sb, NOBH)) {
                        inode->i_mapping->a_ops = &ext2_nobh_aops;
-               else
+                       inode->i_fop = &ext2_file_operations;
+               } else {
                        inode->i_mapping->a_ops = &ext2_aops;
+                       inode->i_fop = &ext2_file_operations;
+               }
                mark_inode_dirty(inode);
                err = ext2_add_nondir(dentry, inode);
        }
@@ -200,7 +187,7 @@ out:
        return err;
 
 out_fail:
-       ext2_dec_count(inode);
+       inode_dec_link_count(inode);
        iput (inode);
        goto out;
 }
@@ -214,7 +201,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);
@@ -228,7 +215,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);
@@ -242,7 +229,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)
@@ -257,11 +244,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;
 }
 
@@ -281,7 +268,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;
@@ -296,8 +283,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;
@@ -337,41 +324,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);
+               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;
 
@@ -406,6 +393,7 @@ struct inode_operations ext2_dir_inode_operations = {
 #endif
        .setattr        = ext2_setattr,
        .permission     = ext2_permission,
+       .sync_flags     = ext2_sync_flags,
 };
 
 struct inode_operations ext2_special_inode_operations = {
@@ -417,4 +405,5 @@ struct inode_operations ext2_special_inode_operations = {
 #endif
        .setattr        = ext2_setattr,
        .permission     = ext2_permission,
+       .sync_flags     = ext2_sync_flags,
 };