1 files changed, 8 insertions, 8 deletions

diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index ef392324bbf1..80058e8ce361 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -19,7 +19,7 @@
 #include <linux/reiserfs_xattr.h>
 #include <linux/quotaops.h>
 
-#define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
+#define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) set_nlink(i, 1); }
 #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i);
 
 // directory item contains array of entry headers. This performs
@@ -622,7 +622,7 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, int mode,
                                dentry->d_name.len, inode, 1 /*visible */ );
         if (retval) {
                 int err;
-                inode->i_nlink--;
+                drop_nlink(inode);
                 reiserfs_update_sd(&th, inode);
                 err = journal_end(&th, dir->i_sb, jbegin_count);
                 if (err)
@@ -702,7 +702,7 @@ static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, int mode,
                                dentry->d_name.len, inode, 1 /*visible */ );
         if (retval) {
                 int err;
-                inode->i_nlink--;
+                drop_nlink(inode);
                 reiserfs_update_sd(&th, inode);
                 err = journal_end(&th, dir->i_sb, jbegin_count);
                 if (err)
@@ -787,7 +787,7 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
                                dentry->d_name.len, inode, 1 /*visible */ );
         if (retval) {
                 int err;
-                inode->i_nlink = 0;
+                clear_nlink(inode);
                 DEC_DIR_INODE_NLINK(dir);
                 reiserfs_update_sd(&th, inode);
                 err = journal_end(&th, dir->i_sb, jbegin_count);
@@ -964,7 +964,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
                 reiserfs_warning(inode->i_sb, "reiserfs-7042",
                                  "deleting nonexistent file (%lu), %d",
                                  inode->i_ino, inode->i_nlink);
-                inode->i_nlink = 1;
+                set_nlink(inode, 1);
         }
 
         drop_nlink(inode);
@@ -1086,7 +1086,7 @@ static int reiserfs_symlink(struct inode *parent_dir,
                                     dentry->d_name.len, inode, 1 /*visible */ );
         if (retval) {
                 int err;
-                inode->i_nlink--;
+                drop_nlink(inode);
                 reiserfs_update_sd(&th, inode);
                 err = journal_end(&th, parent_dir->i_sb, jbegin_count);
                 if (err)
@@ -1129,7 +1129,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,
 
         retval = journal_begin(&th, dir->i_sb, jbegin_count);
         if (retval) {
-                inode->i_nlink--;
+                drop_nlink(inode);
                 reiserfs_write_unlock(dir->i_sb);
                 return retval;
         }
@@ -1144,7 +1144,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,
 
         if (retval) {
                 int err;
-                inode->i_nlink--;
+                drop_nlink(inode);
                 err = journal_end(&th, dir->i_sb, jbegin_count);
                 reiserfs_write_unlock(dir->i_sb);
                 return err ? err : retval;