diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-17 02:17:59 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-17 02:17:59 -0400 |
| commit | 0e0162bb8c008fa7742f69d4d4982c8a37b88f95 (patch) | |
| tree | 4b230ab63b5698a44d2948e70a6cc22405c351e9 /fs/ocfs2 | |
| parent | ae05327a00fd47c34dfe25294b359a3f3fef96e8 (diff) | |
| parent | 38b78a5f18584db6fa7441e0f4531b283b0e6725 (diff) | |
| download | linux-stable-0e0162bb8c008fa7742f69d4d4982c8a37b88f95.tar.gz linux-stable-0e0162bb8c008fa7742f69d4d4982c8a37b88f95.tar.bz2 linux-stable-0e0162bb8c008fa7742f69d4d4982c8a37b88f95.zip | |
Merge branch 'ovl-fixes' into for-linus
Backmerge to resolve a conflict in ovl_lookup_real();
"ovl_lookup_real(): use lookup_one_len_unlocked()" instead,
but it was too late in the cycle to rebase.
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/dlm/dlmmaster.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index 9aed6e202201..13719d3f35f8 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c @@ -2455,6 +2455,8 @@ int dlm_deref_lockres_done_handler(struct o2net_msg *msg, u32 len, void *data, spin_unlock(&dlm->spinlock); + ret = 0; + done: dlm_put(dlm); return ret; |