---

yaml --- r: 139567 b: refs/heads/master c: ad5b365 h: refs/heads/master i: 139565: cd5df87 139563: dd61eca 139559: 5e7726a 139551: 579a652 v: v3
git-mirror · Apr 1, 2009 · 2558fe4 · 2558fe4
1 parent d4ca1d1
commit 2558fe4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c8c45dfab78a1919f6f8a3ea46998c487eb7e12
+refs/heads/master: ad5b365c1266b0c9e8e254a3c1cc4ef66bf33cba
diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c
@@ -16,6 +16,8 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>
 
+#include <asm/unaligned.h>
+
 #define NLMDBG_FACILITY		NLMDBG_MONITOR
 #define NSM_PROGRAM		100024
 #define NSM_VERSION		1
@@ -274,10 +276,12 @@ static void nsm_init_private(struct nsm_handle *nsm)
 {
 	u64 *p = (u64 *)&nsm->sm_priv.data;
 	struct timespec ts;
+	s64 ns;
 
 	ktime_get_ts(&ts);
-	*p++ = timespec_to_ns(&ts);
-	*p = (unsigned long)nsm;
+	ns = timespec_to_ns(&ts);
+	put_unaligned(ns, p);
+	put_unaligned((unsigned long)nsm, p + 1);
 }
 
 static struct nsm_handle *nsm_create_handle(const struct sockaddr *sap,