Revert "add OCFS2_LOCK_RECURSIVE arg_flags to ocfs2_cluster_lock() to prevent hang"

Orabug: 26427132

This reverts commit 387775a70d2e5d89d1a81d78d66655337a5c2765.

Signed-off-by: Ashish Samant <ashish.samant@oracle.com>

diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c
index a6139f3fe32d99d4212c7161c92eca2be43efe43..18f0c9afab662aa3ca2f306ada5225d044c9044b 100644 (file)
--- a/fs/ocfs2/acl.c
+++ b/fs/ocfs2/acl.c
@@ -37,7 +37,6 @@
 #include "xattr.h"
 #include "acl.h"
 
-
 /*
  * Convert from xattr value to acl struct.
  */
@@ -286,7 +285,7 @@ int ocfs2_iop_set_acl(struct inode *inode, struct posix_acl *acl, int type)
        struct buffer_head *bh = NULL;
        int status = 0;
 
-       status = ocfs2_inode_lock_full(inode, &bh, 1, OCFS2_LOCK_RECURSIVE);
+       status = ocfs2_inode_lock(inode, &bh, 1);
        if (status < 0) {
                if (status != -ENOENT)
                        mlog_errno(status);
@@ -308,7 +307,7 @@ struct posix_acl *ocfs2_iop_get_acl(struct inode *inode, int type)
        osb = OCFS2_SB(inode->i_sb);
        if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))
                return NULL;
-       ret = ocfs2_inode_lock_full(inode, &di_bh, 0, OCFS2_LOCK_RECURSIVE);
+       ret = ocfs2_inode_lock(inode, &di_bh, 0);
        if (ret < 0) {
                if (ret != -ENOENT)
                        mlog_errno(ret);

diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 63ec38cc74b860ee9c70d48254166da37c57d2a3..50d5d7dce36d0e4b9e3f71698f350ded16a4bd1c 100644 (file)
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -1448,8 +1448,7 @@ again:
        }
 
        if (lockres->l_flags & OCFS2_LOCK_BLOCKED &&
-           !ocfs2_may_continue_on_blocked_lock(lockres, level) &&
-           !(arg_flags & OCFS2_LOCK_RECURSIVE)) {
+           !ocfs2_may_continue_on_blocked_lock(lockres, level)) {
                /* is the lock is currently blocked on behalf of
                 * another node */
                lockres_add_mask_waiter(lockres, &mw, OCFS2_LOCK_BLOCKED, 0);

diff --git a/fs/ocfs2/dlmglue.h b/fs/ocfs2/dlmglue.h
index 6e54fe78fdbd1de64299b4b969c65c636e8b8956..d293a22c32c5447e3595f1a61deba545f74df7e5 100644 (file)
--- a/fs/ocfs2/dlmglue.h
+++ b/fs/ocfs2/dlmglue.h
@@ -78,8 +78,6 @@ struct ocfs2_orphan_scan_lvb {
 /* don't block waiting for the downconvert thread, instead return -EAGAIN */
 #define OCFS2_LOCK_NONBLOCK            (0x04)
 
-/* if requested level is <= l_level, ignore BLOCKED flag. */
-#define OCFS2_LOCK_RECURSIVE           (0x08)
 /* Locking subclasses of inode cluster lock */
 enum {
        OI_LS_NORMAL = 0,