diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 21:41:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 21:41:34 +0100 |
| commit | 2a2d10f386c1bacabe1a530c06dc8488eac419e5 (patch) | |
| tree | 4606a4a3bafa42a8aa70e001d35883956a0f0589 /fs/ocfs2/dlm/dlmlock.c | |
| parent | Merge branch 'arm/clock-event' of git://git.pengutronix.de/git/ukl/linux-2.6 ... (diff) | |
| parent | [ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo) (diff) | |
| download | linux-2a2d10f386c1bacabe1a530c06dc8488eac419e5.tar.xz linux-2a2d10f386c1bacabe1a530c06dc8488eac419e5.zip | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Diffstat (limited to 'fs/ocfs2/dlm/dlmlock.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c index 437698e9465f..733337772671 100644 --- a/fs/ocfs2/dlm/dlmlock.c +++ b/fs/ocfs2/dlm/dlmlock.c @@ -269,7 +269,7 @@ static enum dlm_status dlmlock_remote(struct dlm_ctxt *dlm, } dlm_revert_pending_lock(res, lock); dlm_lock_put(lock); - } else if (dlm_is_recovery_lock(res->lockname.name, + } else if (dlm_is_recovery_lock(res->lockname.name, res->lockname.len)) { /* special case for the $RECOVERY lock. * there will never be an AST delivered to put |