- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / fs / nilfs2 / namei.c

diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
index ed02e88..07ba838 100644 (file)
--- a/fs/nilfs2/namei.c
+++ b/fs/nilfs2/namei.c
@@ -120,7 +120,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 +148,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)
@@ -188,7 +188,7 @@ static int nilfs_symlink(struct inode *dir, struct dentry *dentry,
                goto out_fail;
 
        /* mark_inode_dirty(inode); */
-       /* nilfs_new_inode() and page_symlink() do this */
+       /* page_symlink() do this */
 
        err = nilfs_add_nondir(dentry, inode);
 out:
@@ -200,7 +200,8 @@ out:
        return err;
 
 out_fail:
-       inode_dec_link_count(inode);
+       drop_nlink(inode);
+       nilfs_mark_inode_dirty(inode);
        iput(inode);
        goto out;
 }
@@ -245,7 +246,7 @@ static int nilfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        if (err)
                return err;
 
-       inode_inc_link_count(dir);
+       inc_nlink(dir);
 
        inode = nilfs_new_inode(dir, S_IFDIR | mode);
        err = PTR_ERR(inode);
@@ -256,7 +257,7 @@ static int nilfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        inode->i_fop = &nilfs_dir_operations;
        inode->i_mapping->a_ops = &nilfs_aops;
 
-       inode_inc_link_count(inode);
+       inc_nlink(inode);
 
        err = nilfs_make_empty(inode, dir);
        if (err)
@@ -266,6 +267,7 @@ static int nilfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        if (err)
                goto out_fail;
 
+       nilfs_mark_inode_dirty(inode);
        d_instantiate(dentry, inode);
 out:
        if (!err)
@@ -276,26 +278,23 @@ out:
        return err;
 
 out_fail:
-       inode_dec_link_count(inode);
-       inode_dec_link_count(inode);
+       drop_nlink(inode);
+       drop_nlink(inode);
+       nilfs_mark_inode_dirty(inode);
        iput(inode);
 out_dir:
-       inode_dec_link_count(dir);
+       drop_nlink(dir);
+       nilfs_mark_inode_dirty(dir);
        goto out;
 }
 
-static int nilfs_unlink(struct inode *dir, struct dentry *dentry)
+static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry)
 {
        struct inode *inode;
        struct nilfs_dir_entry *de;
        struct page *page;
-       struct nilfs_transaction_info ti;
        int err;
 
-       err = nilfs_transaction_begin(dir->i_sb, &ti, 0);
-       if (err)
-               return err;
-
        err = -ENOENT;
        de = nilfs_find_entry(dir, dentry, &page);
        if (!de)
@@ -317,12 +316,28 @@ static int nilfs_unlink(struct inode *dir, struct dentry *dentry)
                goto out;
 
        inode->i_ctime = dir->i_ctime;
-       inode_dec_link_count(inode);
+       drop_nlink(inode);
        err = 0;
 out:
-       if (!err)
+       return err;
+}
+
+static int nilfs_unlink(struct inode *dir, struct dentry *dentry)
+{
+       struct nilfs_transaction_info ti;
+       int err;
+
+       err = nilfs_transaction_begin(dir->i_sb, &ti, 0);
+       if (err)
+               return err;
+
+       err = nilfs_do_unlink(dir, dentry);
+
+       if (!err) {
+               nilfs_mark_inode_dirty(dir);
+               nilfs_mark_inode_dirty(dentry->d_inode);
                err = nilfs_transaction_commit(dir->i_sb);
-       else
+       } else
                nilfs_transaction_abort(dir->i_sb);
 
        return err;
@@ -340,11 +355,13 @@ static int nilfs_rmdir(struct inode *dir, struct dentry *dentry)
 
        err = -ENOTEMPTY;
        if (nilfs_empty_dir(inode)) {
-               err = nilfs_unlink(dir, dentry);
+               err = nilfs_do_unlink(dir, dentry);
                if (!err) {
                        inode->i_size = 0;
-                       inode_dec_link_count(inode);
-                       inode_dec_link_count(dir);
+                       drop_nlink(inode);
+                       nilfs_mark_inode_dirty(inode);
+                       drop_nlink(dir);
+                       nilfs_mark_inode_dirty(dir);
                }
        }
        if (!err)
@@ -395,42 +412,48 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                new_de = nilfs_find_entry(new_dir, new_dentry, &new_page);
                if (!new_de)
                        goto out_dir;
-               inode_inc_link_count(old_inode);
+               inc_nlink(old_inode);
                nilfs_set_link(new_dir, new_de, new_page, old_inode);
+               nilfs_mark_inode_dirty(new_dir);
                new_inode->i_ctime = CURRENT_TIME;
                if (dir_de)
                        drop_nlink(new_inode);
-               inode_dec_link_count(new_inode);
+               drop_nlink(new_inode);
+               nilfs_mark_inode_dirty(new_inode);
        } else {
                if (dir_de) {
                        err = -EMLINK;
                        if (new_dir->i_nlink >= NILFS_LINK_MAX)
                                goto out_dir;
                }
-               inode_inc_link_count(old_inode);
+               inc_nlink(old_inode);
                err = nilfs_add_link(new_dentry, old_inode);
                if (err) {
-                       inode_dec_link_count(old_inode);
+                       drop_nlink(old_inode);
+                       nilfs_mark_inode_dirty(old_inode);
                        goto out_dir;
                }
-               if (dir_de)
-                       inode_inc_link_count(new_dir);
+               if (dir_de) {
+                       inc_nlink(new_dir);
+                       nilfs_mark_inode_dirty(new_dir);
+               }
        }
 
        /*
         * Like most other Unix systems, set the ctime for inodes on a
         * rename.
-        * inode_dec_link_count() will mark the inode dirty.
         */
        old_inode->i_ctime = CURRENT_TIME;
 
        nilfs_delete_entry(old_de, old_page);
-       inode_dec_link_count(old_inode);
+       drop_nlink(old_inode);
 
        if (dir_de) {
                nilfs_set_link(old_inode, dir_de, dir_page, new_dir);
-               inode_dec_link_count(old_dir);
+               drop_nlink(old_dir);
        }
+       nilfs_mark_inode_dirty(old_dir);
+       nilfs_mark_inode_dirty(old_inode);
 
        err = nilfs_transaction_commit(old_dir->i_sb);
        return err;