Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window

Conflicts:
	fs/ocfs2/ocfs2.h

1 files changed, 8 insertions, 2 deletions

diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index d50ba858cfe0..d1a9193960f1 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -274,8 +274,14 @@ static inline int dquot_alloc_space(struct inode *inode, qsize_t nr)
         int ret;
 
         ret = dquot_alloc_space_nodirty(inode, nr);
-        if (!ret)
-                mark_inode_dirty_sync(inode);
+        if (!ret) {
+                /*
+                 * Mark inode fully dirty. Since we are allocating blocks, inode
+                 * would become fully dirty soon anyway and it reportedly
+                 * reduces inode_lock contention.
+                 */
+                mark_inode_dirty(inode);
+        }
         return ret;
 }