Home Home > GIT Browse > SLE11-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGang He <ghe@suse.com>2019-01-09 16:29:20 +0800
committerGang He <ghe@suse.com>2019-01-09 16:29:20 +0800
commitd2d2d8b13ebab3e45672115b33901041b3cfd830 (patch)
tree0414481790e542eea1705a021fee46bc125f17d3
parent1ff345db7f5e8e893562343c79bd971606c00f67 (diff)
ocfs2: fix three small problems in the patch (bsc#1086695)
These two compiler warnings were introduced by the latest ocfs2-fix-deadlock-issue-when-taking-inode-lock-at-v.patch, secondly, correct the Git-commit.
-rw-r--r--patches.fixes/ocfs2-fix-deadlock-issue-when-taking-inode-lock-at-v.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches.fixes/ocfs2-fix-deadlock-issue-when-taking-inode-lock-at-v.patch b/patches.fixes/ocfs2-fix-deadlock-issue-when-taking-inode-lock-at-v.patch
index 4fa50af899..9ea62b0fa0 100644
--- a/patches.fixes/ocfs2-fix-deadlock-issue-when-taking-inode-lock-at-v.patch
+++ b/patches.fixes/ocfs2-fix-deadlock-issue-when-taking-inode-lock-at-v.patch
@@ -5,7 +5,7 @@ Subject: [PATCH 2/3] ocfs2: fix deadlock issue when taking inode lock at vfs
entry points.
Patch-mainline: v4.11-rc1
-Git-commit: 439a36b8ef38657f765b80b775e2885338d72451
+Git-commit: b891fa5024a95c77e0d6fd6655cb74af6fb77f46
References: bsc#1086695
The reason why taking cluster inode lock at vfs entry points opens up a
@@ -44,10 +44,10 @@ diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c
index 6ad887b380ed..57d9f9935920 100644
--- a/fs/ocfs2/acl.c
+++ b/fs/ocfs2/acl.c
-@@ -147,20 +147,18 @@ static struct posix_acl *ocfs2_get_acl(struct inode *inode, int type)
+@@ -147,20 +147,17 @@ static struct posix_acl *ocfs2_get_acl(struct inode *inode, int type)
struct buffer_head *di_bh = NULL;
struct posix_acl *acl;
- int ret;
+- int ret;
+ int had_lock;
+ struct ocfs2_lock_holder oh;
@@ -79,7 +79,7 @@ index b2fe82e04a45..bda93bd2ca31 100644
handle_t *handle = NULL;
struct dquot *transfer_to[MAXQUOTAS] = { };
int qtype;
-+ int had_lock;
++ int had_lock = 0;
+ struct ocfs2_lock_holder oh;
trace_ocfs2_setattr(inode, dentry,