diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /fs/dlm/lockspace.c | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'fs/dlm/lockspace.c')
| -rw-r--r-- | fs/dlm/lockspace.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index 88556dc0458e..d5abafd56a6d 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c | |||
| @@ -706,9 +706,7 @@ static int lkb_idr_is_local(int id, void *p, void *data) | |||
| 706 | { | 706 | { |
| 707 | struct dlm_lkb *lkb = p; | 707 | struct dlm_lkb *lkb = p; |
| 708 | 708 | ||
| 709 | if (!lkb->lkb_nodeid) | 709 | return lkb->lkb_nodeid == 0 && lkb->lkb_grmode != DLM_LOCK_IV; |
| 710 | return 1; | ||
| 711 | return 0; | ||
| 712 | } | 710 | } |
| 713 | 711 | ||
| 714 | static int lkb_idr_is_any(int id, void *p, void *data) | 712 | static int lkb_idr_is_any(int id, void *p, void *data) |