summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 13:37:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 13:37:19 -0700
commite83e43237236ba89316e97a3743b5bd585726e47 (patch)
treead9dcfe1e8813d22d305f1101821238f61b63c77 /fs
parentef161ea1ff96337cbe2253afb72636474d90598e (diff)
parentc07127b48c6367255fb4506e6d6ba6e219205607 (diff)
downloadop-kernel-dev-e83e43237236ba89316e97a3743b5bd585726e47.zip
op-kernel-dev-e83e43237236ba89316e97a3743b5bd585726e47.tar.gz
Merge tag 'dlm-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm fix from David Teigland: "This includes a single commit fixing a missing endian conversion" * tag 'dlm-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: fix missing endian conversion of rcom_status flags
Diffstat (limited to 'fs')
-rw-r--r--fs/dlm/rcom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
index 9d61947..f3f5e72 100644
--- a/fs/dlm/rcom.c
+++ b/fs/dlm/rcom.c
@@ -206,7 +206,7 @@ static void receive_rcom_status(struct dlm_ls *ls, struct dlm_rcom *rc_in)
rs = (struct rcom_status *)rc_in->rc_buf;
- if (!(rs->rs_flags & DLM_RSF_NEED_SLOTS)) {
+ if (!(le32_to_cpu(rs->rs_flags) & DLM_RSF_NEED_SLOTS)) {
status = dlm_recover_status(ls);
goto do_create;
}
OpenPOWER on IntegriCloud