ocfs2: Hook rest of the file system into dentry locking API

Actually replace the vote calls with the new dentry operations. Make any
necessary adjustments to get the scheme to work.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 7bcf69154592..66ca7a82b68a 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1025,12 +1025,10 @@ void ocfs2_drop_inode(struct inode *inode)
         /* Testing ip_orphaned_slot here wouldn't work because we may
          * not have gotten a delete_inode vote from any other nodes
          * yet. */
-        if (oi->ip_flags & OCFS2_INODE_MAYBE_ORPHANED) {
-                mlog(0, "Inode was orphaned on another node, clearing nlink.\n");
-                inode->i_nlink = 0;
-        }
-
-        generic_drop_inode(inode);
+        if (oi->ip_flags & OCFS2_INODE_MAYBE_ORPHANED)
+                generic_delete_inode(inode);
+        else
+                generic_drop_inode(inode);
 
         mlog_exit_void();
 }