[PATCH] r/o bind mount prepwork: inc_nlink() helper

This is mostly included for parity with dec_nlink(), where we will have some
more hooks.  This one should stay pretty darn straightforward for now.

Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

37 files changed, 80 insertions, 75 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index a507d0b5be6c..d9ff283f725e 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -66,8 +66,8 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,
         inode->i_private = data;
         if ((mode & S_IFMT) == S_IFDIR) {
                 inode->i_op = &simple_dir_inode_operations;
-                inode->i_nlink++;
-                dir->i_nlink++;
+                inc_nlink(inode);
+                inc_nlink(dir);
         }
 
         inode->i_fop = fops;
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 88002e45a6b4..7c77c2d8d300 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -263,7 +263,7 @@ static struct inode *usbfs_get_inode (struct super_block *sb, int mode, dev_t de
                         inode->i_fop = &simple_dir_operations;
 
                         /* directory inodes start off with i_nlink == 2 (for "." entry) */
-                        inode->i_nlink++;
+                        inc_nlink(inode);
                         break;
                 }
         }
@@ -295,7 +295,7 @@ static int usbfs_mkdir (struct inode *dir, struct dentry *dentry, int mode)
         mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR;
         res = usbfs_mknod (dir, dentry, mode, 0);
         if (!res)
-                dir->i_nlink++;
+                inc_nlink(dir);
         return res;
 }
 
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 7a7ec2d1d2f4..5241c600ce28 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -233,7 +233,7 @@ struct inode *v9fs_get_inode(struct super_block *sb, int mode)
                         inode->i_op = &v9fs_symlink_inode_operations;
                         break;
                 case S_IFDIR:
-                        inode->i_nlink++;
+                        inc_nlink(inode);
                         if(v9ses->extended)
                                 inode->i_op = &v9fs_dir_inode_operations_ext;
                         else
diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index 54ad70731927..368a1c33a3c8 100644
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -466,7 +466,7 @@ static int autofs_root_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         ent->dentry = dentry;
         autofs_hash_insert(dh,ent);
 
-        dir->i_nlink++;
+        inc_nlink(dir);
         d_instantiate(dentry, iget(dir->i_sb,ino));
         unlock_kernel();
 
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 348bec0982b0..e21bb4668201 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -713,7 +713,7 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         if (p_ino && dentry->d_parent != dentry)
                 atomic_inc(&p_ino->count);
         ino->inode = inode;
-        dir->i_nlink++;
+        inc_nlink(dir);
         dir->i_mtime = CURRENT_TIME;
 
         return 0;
diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c
index ce05d1643dd1..a650f1d0b85e 100644
--- a/fs/bfs/dir.c
+++ b/fs/bfs/dir.c
@@ -163,7 +163,7 @@ static int bfs_link(struct dentry * old, struct inode * dir, struct dentry * new
                 unlock_kernel();
                 return err;
         }
-        inode->i_nlink++;
+        inc_nlink(inode);
         inode->i_ctime = CURRENT_TIME_SEC;
         mark_inode_dirty(inode);
         atomic_inc(&inode->i_count);
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 74441a17e186..76b7fb34101a 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -735,7 +735,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
                 cFYI(1, ("cifs_mkdir returned 0x%x", rc));
                 d_drop(direntry);
         } else {
-                inode->i_nlink++;
+                inc_nlink(inode);
                 if (pTcon->ses->capabilities & CAP_UNIX)
                         rc = cifs_get_inode_info_unix(&newinode, full_path,
                                                       inode->i_sb,xid);
diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 0a2fd8bb7579..0102b28a15fb 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -304,7 +304,7 @@ static int coda_link(struct dentry *source_de, struct inode *dir_inode,
         coda_dir_changed(dir_inode, 0);
         atomic_inc(&inode->i_count);
         d_instantiate(de, inode);
-        inode->i_nlink++;
+        inc_nlink(inode);
         
 out:
         unlock_kernel();
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 816e8ef64560..8a3b6a1a6ad1 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -139,7 +139,7 @@ static int init_dir(struct inode * inode)
         inode->i_fop = &configfs_dir_operations;
 
         /* directory inodes start off with i_nlink == 2 (for "." entry) */
-        inode->i_nlink++;
+        inc_nlink(inode);
         return 0;
 }
 
@@ -169,7 +169,7 @@ static int create_dir(struct config_item * k, struct dentry * p,
         if (!error) {
                 error = configfs_create(d, mode, init_dir);
                 if (!error) {
-                        p->d_inode->i_nlink++;
+                        inc_nlink(p->d_inode);
                         (d)->d_op = &configfs_dentry_ops;
                 } else {
                         struct configfs_dirent *sd = d->d_fsdata;
diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index 3e5fe843e1df..68bd5c93ca52 100644
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -84,7 +84,7 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent)
                 inode->i_op = &configfs_dir_inode_operations;
                 inode->i_fop = &configfs_dir_operations;
                 /* directory inodes start off with i_nlink == 2 (for "." entry) */
-                inode->i_nlink++;
+                inc_nlink(inode);
         } else {
                 pr_debug("configfs: could not get root inode\n");
                 return -ENOMEM;
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index 269e649e6dc6..ecf3da9edf21 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -54,7 +54,7 @@ static struct inode *debugfs_get_inode(struct super_block *sb, int mode, dev_t d
                         inode->i_fop = &simple_dir_operations;
 
                         /* directory inodes start off with i_nlink == 2 (for "." entry) */
-                        inode->i_nlink++;
+                        inc_nlink(inode);
                         break;
                 }
         }
@@ -87,7 +87,7 @@ static int debugfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR;
         res = debugfs_mknod(dir, dentry, mode, 0);
         if (!res)
-                dir->i_nlink++;
+                inc_nlink(dir);
         return res;
 }
 
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 14c55adfae83..b45c88bd5f73 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -1616,7 +1616,7 @@ static int ext3_delete_entry (handle_t *handle,
  */
 static inline void ext3_inc_count(handle_t *handle, struct inode *inode)
 {
-        inode->i_nlink++;
+        inc_nlink(inode);
 }
 
 static inline void ext3_dec_count(handle_t *handle, struct inode *inode)
@@ -1775,7 +1775,7 @@ retry:
                 iput (inode);
                 goto out_stop;
         }
-        dir->i_nlink++;
+        inc_nlink(dir);
         ext3_update_dx_flag(dir);
         ext3_mark_inode_dirty(handle, dir);
         d_instantiate(dentry, inode);
@@ -2341,7 +2341,7 @@ static int ext3_rename (struct inode * old_dir, struct dentry *old_dentry,
                 if (new_inode) {
                         drop_nlink(new_inode);
                 } else {
-                        new_dir->i_nlink++;
+                        inc_nlink(new_dir);
                         ext3_update_dx_flag(new_dir);
                         ext3_mark_inode_dirty(handle, new_dir);
                 }
diff --git a/fs/fuse/control.c b/fs/fuse/control.c
index 79ec1f23d4d2..16b39c053d47 100644
--- a/fs/fuse/control.c
+++ b/fs/fuse/control.c
@@ -116,7 +116,7 @@ int fuse_ctl_add_conn(struct fuse_conn *fc)
                 return 0;
 
         parent = fuse_control_sb->s_root;
-        parent->d_inode->i_nlink++;
+        inc_nlink(parent->d_inode);
         sprintf(name, "%llu", (unsigned long long) fc->id);
         parent = fuse_ctl_add_dentry(parent, fc, name, S_IFDIR | 0500, 2,
                                      &simple_dir_inode_operations,
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index 9ceb0dfaa1cc..99b4ed1b87d2 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -298,7 +298,7 @@ static int hfsplus_link(struct dentry *src_dentry, struct inode *dst_dir,
         if (res)
                 return res;
 
-        inode->i_nlink++;
+        inc_nlink(inode);
         hfsplus_instantiate(dst_dentry, inode, cnid);
         atomic_inc(&inode->i_count);
         inode->i_ctime = CURRENT_TIME_SEC;
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index 4078b0becc5e..25dd6f81eca7 100644
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -89,7 +89,7 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         brelse(bh);
         hpfs_mark_4buffers_dirty(&qbh0);
         hpfs_brelse4(&qbh0);
-        dir->i_nlink++;
+        inc_nlink(dir);
         insert_inode_hash(result);
 
         if (result->i_uid != current->fsuid ||
@@ -635,7 +635,7 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         end:
         hpfs_i(i)->i_parent_dir = new_dir->i_ino;
         if (S_ISDIR(i->i_mode)) {
-                new_dir->i_nlink++;
+                inc_nlink(new_dir);
                 drop_nlink(old_dir);
         }
         if ((fnode = hpfs_map_fnode(i->i_sb, i->i_ino, &bh))) {
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index f5b8f329aca6..5e03b2f67b93 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -377,7 +377,7 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, uid_t uid,
                         inode->i_fop = &simple_dir_operations;
 
                         /* directory inodes start off with i_nlink == 2 (for "." entry) */
-                        inode->i_nlink++;
+                        inc_nlink(inode);
                         break;
                 case S_IFLNK:
                         inode->i_op = &page_symlink_inode_operations;
@@ -418,7 +418,7 @@ static int hugetlbfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
         int retval = hugetlbfs_mknod(dir, dentry, mode | S_IFDIR, 0);
         if (!retval)
-                dir->i_nlink++;
+                inc_nlink(dir);
         return retval;
 }
 
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index a5e9f2205b33..9def6adf4a5d 100644
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -588,7 +588,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode)
         }
 
         dir_i->i_mtime = dir_i->i_ctime = ITIME(je32_to_cpu(rd->mctime));
-        dir_i->i_nlink++;
+        inc_nlink(dir_i);
 
         jffs2_free_raw_dirent(rd);
 
@@ -836,7 +836,7 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
         /* If it was a directory we moved, and there was no victim,
            increase i_nlink on its new parent */
         if (S_ISDIR(old_dentry->d_inode->i_mode) && !victim_f)
-                new_dir_i->i_nlink++;
+                inc_nlink(new_dir_i);
 
         /* Unlink the original */
         ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
@@ -848,7 +848,7 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
                 /* Oh shit. We really ought to make a single node which can do both atomically */
                 struct jffs2_inode_info *f = JFFS2_INODE_INFO(old_dentry->d_inode);
                 down(&f->sem);
-                old_dentry->d_inode->i_nlink++;
+                inc_nlink(old_dentry->d_inode);
                 if (f->inocache)
                         f->inocache->nlink++;
                 up(&f->sem);
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 72d9909d95ff..7bc1a4201c0c 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -277,13 +277,13 @@ void jffs2_read_inode (struct inode *inode)
 
                 for (fd=f->dents; fd; fd = fd->next) {
                         if (fd->type == DT_DIR && fd->ino)
-                                inode->i_nlink++;
+                                inc_nlink(inode);
                 }
                 /* and '..' */
-                inode->i_nlink++;
+                inc_nlink(inode);
                 /* Root dir gets i_nlink 3 for some reason */
                 if (inode->i_ino == 1)
-                        inode->i_nlink++;
+                        inc_nlink(inode);
 
                 inode->i_op = &jffs2_dir_inode_operations;
                 inode->i_fop = &jffs2_dir_operations;
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 088b85976ac0..8cef88170aa4 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -292,7 +292,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
         mark_inode_dirty(ip);
 
         /* update parent directory inode */
-        dip->i_nlink++;         /* for '..' from child directory */
+        inc_nlink(dip);         /* for '..' from child directory */
         dip->i_ctime = dip->i_mtime = CURRENT_TIME;
         mark_inode_dirty(dip);
 
@@ -822,7 +822,7 @@ static int jfs_link(struct dentry *old_dentry,
                 goto free_dname;
 
         /* update object inode */
-        ip->i_nlink++;          /* for new link */
+        inc_nlink(ip);          /* for new link */
         ip->i_ctime = CURRENT_TIME;
         dir->i_ctime = dir->i_mtime = CURRENT_TIME;
         mark_inode_dirty(dir);
@@ -1206,7 +1206,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                         goto out4;
                 }
                 if (S_ISDIR(old_ip->i_mode))
-                        new_dir->i_nlink++;
+                        inc_nlink(new_dir);
         }
         /*
          * Remove old directory entry
diff --git a/fs/libfs.c b/fs/libfs.c
index 9204feba75ac..bd08e0e64a8c 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -243,7 +243,7 @@ int simple_link(struct dentry *old_dentry, struct inode *dir, struct dentry *den
         struct inode *inode = old_dentry->d_inode;
 
         inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
-        inode->i_nlink++;
+        inc_nlink(inode);
         atomic_inc(&inode->i_count);
         dget(dentry);
         d_instantiate(dentry, inode);
@@ -306,7 +306,7 @@ int simple_rename(struct inode *old_dir, struct dentry *old_dentry,
                         drop_nlink(old_dir);
         } else if (they_are_dirs) {
                 drop_nlink(old_dir);
-                new_dir->i_nlink++;
+                inc_nlink(new_dir);
         }
 
         old_dir->i_ctime = old_dir->i_mtime = new_dir->i_ctime =
diff --git a/fs/msdos/namei.c b/fs/msdos/namei.c
index 635613f2f65a..fa868c755907 100644
--- a/fs/msdos/namei.c
+++ b/fs/msdos/namei.c
@@ -389,7 +389,7 @@ static int msdos_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         err = msdos_add_entry(dir, msdos_name, 1, is_hid, cluster, &ts, &sinfo);
         if (err)
                 goto out_free;
-        dir->i_nlink++;
+        inc_nlink(dir);
 
         inode = fat_build_inode(sb, sinfo.de, sinfo.i_pos);
         brelse(sinfo.bh);
@@ -551,7 +551,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
                 }
                 drop_nlink(old_dir);
                 if (!new_inode)
-                        new_dir->i_nlink++;
+                        inc_nlink(new_dir);
         }
 
         err = fat_remove_entries(old_dir, &old_sinfo);  /* and releases bh */
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c
index 0368c6402182..16b8d1ba7066 100644
--- a/fs/ocfs2/dlm/dlmfs.c
+++ b/fs/ocfs2/dlm/dlmfs.c
@@ -338,7 +338,7 @@ static struct inode *dlmfs_get_root_inode(struct super_block *sb)
                 inode->i_blocks = 0;
                 inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
                 inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-                inode->i_nlink++;
+                inc_nlink(inode);
 
                 inode->i_fop = &simple_dir_operations;
                 inode->i_op = &dlmfs_root_inode_operations;
@@ -395,7 +395,7 @@ static struct inode *dlmfs_get_inode(struct inode *parent,
 
                 /* directory inodes start off with i_nlink ==
                  * 2 (for "." entry) */
-                inode->i_nlink++;
+                inc_nlink(inode);
                 break;
         }
 
@@ -449,7 +449,7 @@ static int dlmfs_mkdir(struct inode * dir,
         }
         ip->ip_dlm = dlm;
 
-        dir->i_nlink++;
+        inc_nlink(dir);
         d_instantiate(dentry, inode);
         dget(dentry);   /* Extra count - pin the dentry in core */
 
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 40f83f53053a..8c370a39e0c1 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -429,7 +429,7 @@ static int ocfs2_mknod(struct inode *dir,
                         mlog_errno(status);
                         goto leave;
                 }
-                dir->i_nlink++;
+                inc_nlink(dir);
         }
 
         status = ocfs2_add_entry(handle, dentry, inode,
@@ -730,7 +730,7 @@ static int ocfs2_link(struct dentry *old_dentry,
                 goto bail;
         }
 
-        inode->i_nlink++;
+        inc_nlink(inode);
         inode->i_ctime = CURRENT_TIME;
         fe->i_links_count = cpu_to_le16(inode->i_nlink);
         fe->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);
@@ -952,7 +952,7 @@ static int ocfs2_unlink(struct inode *dir,
                                                 parent_node_bh);
                 if (status < 0) {
                         mlog_errno(status);
-                        dir->i_nlink++;
+                        inc_nlink(dir);
                 }
         }
 
@@ -1382,7 +1382,7 @@ static int ocfs2_rename(struct inode *old_dir,
                 if (new_inode) {
                         new_inode->i_nlink--;
                 } else {
-                        new_dir->i_nlink++;
+                        inc_nlink(new_dir);
                         mark_inode_dirty(new_dir);
                 }
         }
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index bc0e51662424..2faf4cdf61b0 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -75,7 +75,7 @@ struct inode *ramfs_get_inode(struct super_block *sb, int mode, dev_t dev)
                         inode->i_fop = &simple_dir_operations;
 
                         /* directory inodes start off with i_nlink == 2 (for "." entry) */
-                        inode->i_nlink++;
+                        inc_nlink(inode);
                         break;
                 case S_IFLNK:
                         inode->i_op = &page_symlink_inode_operations;
@@ -113,7 +113,7 @@ static int ramfs_mkdir(struct inode * dir, struct dentry * dentry, int mode)
 {
         int retval = ramfs_mknod(dir, dentry, mode | S_IFDIR, 0);
         if (!retval)
-                dir->i_nlink++;
+                inc_nlink(dir);
         return retval;
 }
 
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index c76d427e027b..cf92e89515f2 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -19,7 +19,7 @@
 #include <linux/smp_lock.h>
 #include <linux/quotaops.h>
 
-#define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { i->i_nlink++; 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) i->i_nlink=1; }
 #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i);
 
 // directory item contains array of entry headers. This performs
@@ -1006,7 +1006,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
             reiserfs_cut_from_item(&th, &path, &(de.de_entry_key), dir, NULL,
                                    0);
         if (retval < 0) {
-                inode->i_nlink++;
+                inc_nlink(inode);
                 goto end_unlink;
         }
         inode->i_ctime = CURRENT_TIME_SEC;
@@ -1143,7 +1143,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,
         }
 
         /* inc before scheduling so reiserfs_unlink knows we are here */
-        inode->i_nlink++;
+        inc_nlink(inode);
 
         retval = journal_begin(&th, dir->i_sb, jbegin_count);
         if (retval) {
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 5f3d725d1125..3aa3434621ca 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -103,7 +103,7 @@ static int init_dir(struct inode * inode)
         inode->i_fop = &sysfs_dir_operations;
 
         /* directory inodes start off with i_nlink == 2 (for "." entry) */
-        inode->i_nlink++;
+        inc_nlink(inode);
         return 0;
 }
 
@@ -137,7 +137,7 @@ static int create_dir(struct kobject * k, struct dentry * p,
                 if (!error) {
                         error = sysfs_create(*d, mode, init_dir);
                         if (!error) {
-                                p->d_inode->i_nlink++;
+                                inc_nlink(p->d_inode);
                                 (*d)->d_op = &sysfs_dentry_ops;
                                 d_rehash(*d);
                         }
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index 40190c489271..20551a1b8a56 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -49,7 +49,7 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
                 inode->i_op = &sysfs_dir_inode_operations;
                 inode->i_fop = &sysfs_dir_operations;
                 /* directory inodes start off with i_nlink == 2 (for "." entry) */
-                inode->i_nlink++;       
+                inc_nlink(inode);
         } else {
                 pr_debug("sysfs: could not get root inode\n");
                 return -ENOMEM;
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index b223b32db991..ae21a0e59e95 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1165,7 +1165,7 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
                         inode->i_op = &udf_dir_inode_operations;
                         inode->i_fop = &udf_dir_operations;
                         inode->i_mode |= S_IFDIR;
-                        inode->i_nlink ++;
+                        inc_nlink(inode);
                         break;
                 }
                 case ICBTAG_FILE_TYPE_REALTIME:
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index d14d25534aa8..e40c95e65117 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -762,7 +762,7 @@ static int udf_mkdir(struct inode * dir, struct dentry * dentry, int mode)
                 cpu_to_le32(UDF_I_UNIQUE(inode) & 0x00000000FFFFFFFFUL);
         cfi.fileCharacteristics |= FID_FILE_CHAR_DIRECTORY;
         udf_write_fi(dir, &cfi, fi, &fibh, NULL, NULL);
-        dir->i_nlink++;
+        inc_nlink(dir);
         mark_inode_dirty(dir);
         d_instantiate(dentry, inode);
         if (fibh.sbh != fibh.ebh)
@@ -1147,7 +1147,7 @@ static int udf_link(struct dentry * old_dentry, struct inode * dir,
         if (fibh.sbh != fibh.ebh)
                 udf_release_data(fibh.ebh);
         udf_release_data(fibh.sbh);
-        inode->i_nlink ++;
+        inc_nlink(inode);
         inode->i_ctime = current_fs_time(inode->i_sb);
         mark_inode_dirty(inode);
         atomic_inc(&inode->i_count);
@@ -1282,7 +1282,7 @@ static int udf_rename (struct inode * old_dir, struct dentry * old_dentry,
                 }
                 else
                 {
-                        new_dir->i_nlink ++;
+                        inc_nlink(new_dir);
                         mark_inode_dirty(new_dir);
                 }
         }
diff --git a/fs/vfat/namei.c b/fs/vfat/namei.c
index 090d74ffa061..5846ba2d5d9f 100644
--- a/fs/vfat/namei.c
+++ b/fs/vfat/namei.c
@@ -837,7 +837,7 @@ static int vfat_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         if (err)
                 goto out_free;
         dir->i_version++;
-        dir->i_nlink++;
+        inc_nlink(dir);
 
         inode = fat_build_inode(sb, sinfo.de, sinfo.i_pos);
         brelse(sinfo.bh);
@@ -932,7 +932,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
                 }
                 drop_nlink(old_dir);
                 if (!new_inode)
-                        new_dir->i_nlink++;
+                        inc_nlink(new_dir);
         }
 
         err = fat_remove_entries(old_dir, &old_sinfo);  /* and releases bh */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 26d3c61116c0..6a5267da565f 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1219,9 +1219,14 @@ static inline void mark_inode_dirty_sync(struct inode *inode)
         __mark_inode_dirty(inode, I_DIRTY_SYNC);
 }
 
-static inline void inode_inc_link_count(struct inode *inode)
+static inline void inc_nlink(struct inode *inode)
 {
         inode->i_nlink++;
+}
+
+static inline void inode_inc_link_count(struct inode *inode)
+{
+        inc_nlink(inode);
         mark_inode_dirty(inode);
 }
 
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 10aa8eeeb112..d75d0ba83360 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -168,7 +168,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb, int mode,
                         /* all is ok */
                         info->user = get_uid(u);
                 } else if (S_ISDIR(mode)) {
-                        inode->i_nlink++;
+                        inc_nlink(inode);
                         /* Some things misbehave if size == 0 on a directory */
                         inode->i_size = 2 * DIRENT_SIZE;
                         inode->i_op = &mqueue_dir_inode_operations;
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 8c3c400cce91..9d850ae13b1b 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -377,7 +377,7 @@ static int cpuset_fill_super(struct super_block *sb, void *unused_data,
                 inode->i_op = &simple_dir_inode_operations;
                 inode->i_fop = &simple_dir_operations;
                 /* directories start off with i_nlink == 2 (for "." entry) */
-                inode->i_nlink++;
+                inc_nlink(inode);
         } else {
                 return -ENOMEM;
         }
@@ -1565,7 +1565,7 @@ static int cpuset_create_file(struct dentry *dentry, int mode)
                 inode->i_fop = &simple_dir_operations;
 
                 /* start off with i_nlink == 2 (for "." entry) */
-                inode->i_nlink++;
+                inc_nlink(inode);
         } else if (S_ISREG(mode)) {
                 inode->i_size = 0;
                 inode->i_fop = &cpuset_file_operations;
@@ -1598,7 +1598,7 @@ static int cpuset_create_dir(struct cpuset *cs, const char *name, int mode)
         error = cpuset_create_file(dentry, S_IFDIR | mode);
         if (!error) {
                 dentry->d_fsdata = cs;
-                parent->d_inode->i_nlink++;
+                inc_nlink(parent->d_inode);
                 cs->dentry = dentry;
         }
         dput(dentry);
@@ -2033,7 +2033,7 @@ int __init cpuset_init(void)
         }
         root = cpuset_mount->mnt_sb->s_root;
         root->d_fsdata = &top_cpuset;
-        root->d_inode->i_nlink++;
+        inc_nlink(root->d_inode);
         top_cpuset.dentry = root;
         root->d_inode->i_op = &cpuset_dir_inode_operations;
         number_of_cpusets = 1;
diff --git a/mm/shmem.c b/mm/shmem.c
index 908dd947b1ea..bb8ca7ef7094 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1379,7 +1379,7 @@ shmem_get_inode(struct super_block *sb, int mode, dev_t dev)
                                                         &sbinfo->policy_nodes);
                         break;
                 case S_IFDIR:
-                        inode->i_nlink++;
+                        inc_nlink(inode);
                         /* Some things misbehave if size == 0 on a directory */
                         inode->i_size = 2 * BOGO_DIRENT_SIZE;
                         inode->i_op = &shmem_dir_inode_operations;
@@ -1715,7 +1715,7 @@ static int shmem_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 
         if ((error = shmem_mknod(dir, dentry, mode | S_IFDIR, 0)))
                 return error;
-        dir->i_nlink++;
+        inc_nlink(dir);
         return 0;
 }
 
@@ -1750,7 +1750,7 @@ static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr
 
         dir->i_size += BOGO_DIRENT_SIZE;
         inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
-        inode->i_nlink++;
+        inc_nlink(inode);
         atomic_inc(&inode->i_count);    /* New dentry reference */
         dget(dentry);           /* Extra pinning count for the created dentry */
         d_instantiate(dentry, inode);
@@ -1807,7 +1807,7 @@ static int shmem_rename(struct inode *old_dir, struct dentry *old_dentry, struct
                         drop_nlink(old_dir);
         } else if (they_are_dirs) {
                 drop_nlink(old_dir);
-                new_dir->i_nlink++;
+                inc_nlink(new_dir);
         }
 
         old_dir->i_size -= BOGO_DIRENT_SIZE;
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 700c6e061a04..9a0b41a97f90 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -494,7 +494,7 @@ rpc_get_inode(struct super_block *sb, int mode)
                 case S_IFDIR:
                         inode->i_fop = &simple_dir_operations;
                         inode->i_op = &simple_dir_inode_operations;
-                        inode->i_nlink++;
+                        inc_nlink(inode);
                 default:
                         break;
         }
@@ -571,7 +571,7 @@ rpc_populate(struct dentry *parent,
                 if (private)
                         rpc_inode_setowner(inode, private);
                 if (S_ISDIR(mode))
-                        dir->i_nlink++;
+                        inc_nlink(dir);
                 d_add(dentry, inode);
         }
         mutex_unlock(&dir->i_mutex);
@@ -593,7 +593,7 @@ __rpc_mkdir(struct inode *dir, struct dentry *dentry)
                 goto out_err;
         inode->i_ino = iunique(dir->i_sb, 100);
         d_instantiate(dentry, inode);
-        dir->i_nlink++;
+        inc_nlink(dir);
         inode_dir_notify(dir, DN_CREATE);
         return 0;
 out_err:
diff --git a/security/inode.c b/security/inode.c
index 49ee51529396..9b16e14f3a80 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -78,7 +78,7 @@ static struct inode *get_inode(struct super_block *sb, int mode, dev_t dev)
                         inode->i_fop = &simple_dir_operations;
 
                         /* directory inodes start off with i_nlink == 2 (for "." entry) */
-                        inode->i_nlink++;
+                        inc_nlink(inode);
                         break;
                 }
         }
@@ -111,7 +111,7 @@ static int mkdir(struct inode *dir, struct dentry *dentry, int mode)
         mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR;
         res = mknod(dir, dentry, mode, 0);
         if (!res)
-                dir->i_nlink++;
+                inc_nlink(dir);
         return res;
 }
 
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index bab7b386cb8d..cd244419c980 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -1253,10 +1253,10 @@ static int sel_make_dir(struct inode *dir, struct dentry *dentry)
         inode->i_op = &simple_dir_inode_operations;
         inode->i_fop = &simple_dir_operations;
         /* directory inodes start off with i_nlink == 2 (for "." entry) */
-        inode->i_nlink++;
+        inc_nlink(inode);
         d_add(dentry, inode);
         /* bump link count on parent directory, too */
-        dir->i_nlink++;
+        inc_nlink(dir);
 out:
         return ret;
 }