3 files changed, 41 insertions, 44 deletions

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/file.c b/fs/ocfs2/file.c
index 2bbfa17090cf..d9ba0a931a03 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -961,25 +961,23 @@ static inline int ocfs2_write_should_remove_suid(struct inode *inode)
 }
 
 static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
-                                    const char __user *buf,
-                                    size_t count,
+                                    const struct iovec *iov,
+                                    unsigned long nr_segs,
                                     loff_t pos)
 {
-        struct iovec local_iov = { .iov_base = (void __user *)buf,
-                                   .iov_len = count };
         int ret, rw_level = -1, meta_level = -1, have_alloc_sem = 0;
         u32 clusters;
         struct file *filp = iocb->ki_filp;
         struct inode *inode = filp->f_dentry->d_inode;
         loff_t newsize, saved_pos;
 
-        mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", filp, buf,
-                   (unsigned int)count,
+        mlog_entry("(0x%p, %u, '%.*s')\n", filp,
+                   (unsigned int)nr_segs,
                    filp->f_dentry->d_name.len,
                    filp->f_dentry->d_name.name);
 
         /* happy write of zero bytes */
-        if (count == 0)
+        if (iocb->ki_left == 0)
                 return 0;
 
         if (!inode) {
@@ -1048,7 +1046,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
                 } else {
                         saved_pos = iocb->ki_pos;
                 }
-                newsize = count + saved_pos;
+                newsize = iocb->ki_left + saved_pos;
 
                 mlog(0, "pos=%lld newsize=%lld cursize=%lld\n",
                      (long long) saved_pos, (long long) newsize,
@@ -1081,7 +1079,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
                 if (!clusters)
                         break;
 
-                ret = ocfs2_extend_file(inode, NULL, newsize, count);
+                ret = ocfs2_extend_file(inode, NULL, newsize, iocb->ki_left);
                 if (ret < 0) {
                         if (ret != -ENOSPC)
                                 mlog_errno(ret);
@@ -1098,7 +1096,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
         /* communicate with ocfs2_dio_end_io */
         ocfs2_iocb_set_rw_locked(iocb);
 
-        ret = generic_file_aio_write_nolock(iocb, &local_iov, 1, &iocb->ki_pos);
+        ret = generic_file_aio_write_nolock(iocb, iov, nr_segs, iocb->ki_pos);
 
         /* buffered aio wouldn't have proper lock coverage today */
         BUG_ON(ret == -EIOCBQUEUED && !(filp->f_flags & O_DIRECT));
@@ -1132,16 +1130,16 @@ out:
 }
 
 static ssize_t ocfs2_file_aio_read(struct kiocb *iocb,
-                                   char __user *buf,
-                                   size_t count,
+                                   const struct iovec *iov,
+                                   unsigned long nr_segs,
                                    loff_t pos)
 {
         int ret = 0, rw_level = -1, have_alloc_sem = 0;
         struct file *filp = iocb->ki_filp;
         struct inode *inode = filp->f_dentry->d_inode;
 
-        mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", filp, buf,
-                   (unsigned int)count,
+        mlog_entry("(0x%p, %u, '%.*s')\n", filp,
+                   (unsigned int)nr_segs,
                    filp->f_dentry->d_name.len,
                    filp->f_dentry->d_name.name);
 
@@ -1185,7 +1183,7 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb,
         }
         ocfs2_meta_unlock(inode, 0);
 
-        ret = generic_file_aio_read(iocb, buf, count, iocb->ki_pos);
+        ret = generic_file_aio_read(iocb, iov, nr_segs, iocb->ki_pos);
         if (ret == -EINVAL)
                 mlog(ML_ERROR, "generic_file_aio_read returned -EINVAL\n");
 
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 849c3b4bb94a..259155f0eb2e 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);
@@ -739,7 +739,7 @@ static int ocfs2_link(struct dentry *old_dentry,
         err = ocfs2_journal_dirty(handle, fe_bh);
         if (err < 0) {
                 le16_add_cpu(&fe->i_links_count, -1);
-                inode->i_nlink--;
+                drop_nlink(inode);
                 mlog_errno(err);
                 goto bail;
         }
@@ -749,7 +749,7 @@ static int ocfs2_link(struct dentry *old_dentry,
                               parent_fe_bh, de_bh);
         if (err) {
                 le16_add_cpu(&fe->i_links_count, -1);
-                inode->i_nlink--;
+                drop_nlink(inode);
                 mlog_errno(err);
                 goto bail;
         }
@@ -795,11 +795,23 @@ static int ocfs2_remote_dentry_delete(struct dentry *dentry)
         return ret;
 }
 
+static inline int inode_is_unlinkable(struct inode *inode)
+{
+        if (S_ISDIR(inode->i_mode)) {
+                if (inode->i_nlink == 2)
+                        return 1;
+                return 0;
+        }
+
+        if (inode->i_nlink == 1)
+                return 1;
+        return 0;
+}
+
 static int ocfs2_unlink(struct inode *dir,
                         struct dentry *dentry)
 {
         int status;
-        unsigned int saved_nlink = 0;
         struct inode *inode = dentry->d_inode;
         struct ocfs2_super *osb = OCFS2_SB(dir->i_sb);
         u64 blkno;
@@ -874,16 +886,6 @@ static int ocfs2_unlink(struct inode *dir,
                 }
         }
 
-        /* There are still a few steps left until we can consider the
-         * unlink to have succeeded. Save off nlink here before
-         * modification so we can set it back in case we hit an issue
-         * before commit. */
-        saved_nlink = inode->i_nlink;
-        if (S_ISDIR(inode->i_mode))
-                inode->i_nlink = 0;
-        else
-                inode->i_nlink--;
-
         status = ocfs2_remote_dentry_delete(dentry);
         if (status < 0) {
                 /* This vote should succeed under all normal
@@ -892,7 +894,7 @@ static int ocfs2_unlink(struct inode *dir,
                 goto leave;
         }
 
-        if (!inode->i_nlink) {
+        if (inode_is_unlinkable(inode)) {
                 status = ocfs2_prepare_orphan_dir(osb, handle, inode,
                                                   orphan_name,
                                                   &orphan_entry_bh);
@@ -919,7 +921,7 @@ static int ocfs2_unlink(struct inode *dir,
 
         fe = (struct ocfs2_dinode *) fe_bh->b_data;
 
-        if (!inode->i_nlink) {
+        if (inode_is_unlinkable(inode)) {
                 status = ocfs2_orphan_add(osb, handle, inode, fe, orphan_name,
                                           orphan_entry_bh);
                 if (status < 0) {
@@ -935,10 +937,10 @@ static int ocfs2_unlink(struct inode *dir,
                 goto leave;
         }
 
-        /* We can set nlink on the dinode now. clear the saved version
-         * so that it doesn't get set later. */
+        if (S_ISDIR(inode->i_mode))
+                drop_nlink(inode);
+        drop_nlink(inode);
         fe->i_links_count = cpu_to_le16(inode->i_nlink);
-        saved_nlink = 0;
 
         status = ocfs2_journal_dirty(handle, fe_bh);
         if (status < 0) {
@@ -947,19 +949,16 @@ static int ocfs2_unlink(struct inode *dir,
         }
 
         if (S_ISDIR(inode->i_mode)) {
-                dir->i_nlink--;
+                drop_nlink(dir);
                 status = ocfs2_mark_inode_dirty(handle, dir,
                                                 parent_node_bh);
                 if (status < 0) {
                         mlog_errno(status);
-                        dir->i_nlink++;
+                        inc_nlink(dir);
                 }
         }
 
 leave:
-        if (status < 0 && saved_nlink)
-                inode->i_nlink = saved_nlink;
-
         if (handle)
                 ocfs2_commit_trans(handle);
 
@@ -1382,7 +1381,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);
                 }
         }