From f5fb215365791507ec98796ea624abeafa31901c Mon Sep 17 00:00:00 2001
From: James Simmons <uja.ornl@gmail.com>
Date: Fri, 13 Jul 2012 09:35:06 -0400
Subject: [PATCH 1/1] LU-812 kernel: remove smp_lock.h

smp_lock.h has been removed from kernel since 2.6.39.

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Wally Wang <wang@cray.com>
Change-Id: Ia15eb8befe4d7c8c1ab29b5860c7ec5bfffbf563
Reviewed-on: http://review.whamcloud.com/2000
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Peng Tao <tao.peng@emc.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---
 libcfs/include/libcfs/linux/kp30.h       | 1 -
 libcfs/include/libcfs/linux/linux-lock.h | 1 -
 libcfs/libcfs/linux/linux-debug.c        | 2 ++
 libcfs/libcfs/linux/linux-proc.c         | 1 -
 lnet/include/lnet/linux/lib-types.h      | 1 -
 lnet/klnds/mxlnd/mxlnd.h                 | 1 -
 lnet/klnds/o2iblnd/o2iblnd.h             | 1 -
 lnet/klnds/ptllnd/ptllnd.h               | 1 -
 lnet/klnds/ralnd/ralnd.h                 | 1 -
 lnet/klnds/socklnd/socklnd_lib-linux.h   | 1 -
 lustre/include/linux/obd.h               | 2 --
 lustre/lclient/lcommon_cl.c              | 1 -
 lustre/llite/dcache.c                    | 1 -
 lustre/llite/dir.c                       | 1 -
 lustre/llite/llite_mmap.c                | 2 --
 lustre/llite/lloop.c                     | 1 -
 lustre/llite/namei.c                     | 1 -
 lustre/llite/rw.c                        | 2 --
 lustre/llite/rw26.c                      | 2 --
 lustre/llite/statahead.c                 | 1 -
 lustre/llite/symlink.c                   | 1 -
 lustre/llite/xattr.c                     | 1 -
 lustre/mds/handler.c                     | 1 -
 lustre/obdclass/linux/linux-module.c     | 1 -
 lustre/obdclass/obd_mount.c              | 3 +++
 lustre/osd-ldiskfs/osd_iam.c             | 1 -
 lustre/quota/quota_adjust_qunit.c        | 1 -
 lustre/quota/quota_check.c               | 1 -
 lustre/quota/quota_ctl.c                 | 1 -
 lustre/quota/quota_interface.c           | 1 -
 30 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/libcfs/include/libcfs/linux/kp30.h b/libcfs/include/libcfs/linux/kp30.h
index ce77cec..e132f83d 100644
--- a/libcfs/include/libcfs/linux/kp30.h
+++ b/libcfs/include/libcfs/linux/kp30.h
@@ -60,7 +60,6 @@
 #include <linux/highmem.h>
 #include <linux/module.h>
 #include <linux/version.h>
-#include <linux/smp_lock.h>
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
 #include <linux/rwsem.h>
diff --git a/libcfs/include/libcfs/linux/linux-lock.h b/libcfs/include/libcfs/linux/linux-lock.h
index b2d2213..8a9f66c 100644
--- a/libcfs/include/libcfs/linux/linux-lock.h
+++ b/libcfs/include/libcfs/linux/linux-lock.h
@@ -47,7 +47,6 @@
 #error This include is only for kernel use.
 #endif
 
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 
 /*
diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c
index bfee25d..3417631 100644
--- a/libcfs/libcfs/linux/linux-debug.c
+++ b/libcfs/libcfs/linux/linux-debug.c
@@ -49,7 +49,9 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
+#ifdef HAVE_KERNEL_LOCKED
 #include <linux/smp_lock.h>
+#endif
 #include <linux/unistd.h>
 #include <linux/interrupt.h>
 #include <asm/system.h>
diff --git a/libcfs/libcfs/linux/linux-proc.c b/libcfs/libcfs/linux/linux-proc.c
index 6a3f433..99dcb32 100644
--- a/libcfs/libcfs/linux/linux-proc.c
+++ b/libcfs/libcfs/linux/linux-proc.c
@@ -49,7 +49,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <net/sock.h>
 #include <linux/uio.h>
diff --git a/lnet/include/lnet/linux/lib-types.h b/lnet/include/lnet/linux/lib-types.h
index 4d29d3c..6e6ed5d 100644
--- a/lnet/include/lnet/linux/lib-types.h
+++ b/lnet/include/lnet/linux/lib-types.h
@@ -41,7 +41,6 @@
 
 #ifdef __KERNEL__
 # include <linux/uio.h>
-# include <linux/smp_lock.h>
 # include <linux/types.h>
 #else
 # define LNET_USE_LIB_FREELIST
diff --git a/lnet/klnds/mxlnd/mxlnd.h b/lnet/klnds/mxlnd/mxlnd.h
index 3cb6c56..2072e74 100644
--- a/lnet/klnds/mxlnd/mxlnd.h
+++ b/lnet/klnds/mxlnd/mxlnd.h
@@ -48,7 +48,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <linux/uio.h>
 #include <linux/fs.h>
diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h
index c7a4f8c..735a872 100644
--- a/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/lnet/klnds/o2iblnd/o2iblnd.h
@@ -47,7 +47,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <linux/uio.h>
 
diff --git a/lnet/klnds/ptllnd/ptllnd.h b/lnet/klnds/ptllnd/ptllnd.h
index e019028..93ba94c 100644
--- a/lnet/klnds/ptllnd/ptllnd.h
+++ b/lnet/klnds/ptllnd/ptllnd.h
@@ -45,7 +45,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <linux/uio.h>
 
diff --git a/lnet/klnds/ralnd/ralnd.h b/lnet/klnds/ralnd/ralnd.h
index 14f2466..9d6fcab 100644
--- a/lnet/klnds/ralnd/ralnd.h
+++ b/lnet/klnds/ralnd/ralnd.h
@@ -45,7 +45,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <linux/uio.h>
 
diff --git a/lnet/klnds/socklnd/socklnd_lib-linux.h b/lnet/klnds/socklnd/socklnd_lib-linux.h
index 65ee770..07e59a1 100644
--- a/lnet/klnds/socklnd/socklnd_lib-linux.h
+++ b/lnet/klnds/socklnd/socklnd_lib-linux.h
@@ -47,7 +47,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <net/sock.h>
 #include <net/tcp.h>
diff --git a/lustre/include/linux/obd.h b/lustre/include/linux/obd.h
index 5c8024f..5ece5fd 100644
--- a/lustre/include/linux/obd.h
+++ b/lustre/include/linux/obd.h
@@ -47,8 +47,6 @@
 # include <linux/fs.h>
 # include <linux/list.h>
 # include <linux/sched.h>  /* for struct task_struct, for current.h */
-# include <asm/current.h>  /* for smp_lock.h */
-# include <linux/smp_lock.h>
 # include <linux/proc_fs.h>
 # include <linux/mount.h>
 # include <linux/lustre_intent.h>
diff --git a/lustre/lclient/lcommon_cl.c b/lustre/lclient/lcommon_cl.c
index 98e67b1..1d65cf1 100644
--- a/lustre/lclient/lcommon_cl.c
+++ b/lustre/lclient/lcommon_cl.c
@@ -46,7 +46,6 @@
 # include <linux/fs.h>
 # include <linux/sched.h>
 # include <linux/mm.h>
-# include <linux/smp_lock.h>
 # include <linux/quotaops.h>
 # include <linux/highmem.h>
 # include <linux/pagemap.h>
diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 4a4f5f5..14fb634 100644
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -36,7 +36,6 @@
 
 #include <linux/fs.h>
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
 #include <linux/quotaops.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE
diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index 360b6e3..137df4f 100644
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -42,7 +42,6 @@
 #include <linux/pagemap.h>
 #include <linux/mm.h>
 #include <linux/version.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <linux/buffer_head.h>   // for wait_on_buffer
 #include <linux/pagevec.h>
diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
index ebdc99a..0115b6c 100644
--- a/lustre/llite/llite_mmap.c
+++ b/lustre/llite/llite_mmap.c
@@ -42,7 +42,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <linux/version.h>
 #include <asm/system.h>
@@ -53,7 +52,6 @@
 #include <asm/uaccess.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
-#include <linux/smp_lock.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
diff --git a/lustre/llite/lloop.c b/lustre/llite/lloop.c
index 15e4314..8c867c5 100644
--- a/lustre/llite/lloop.c
+++ b/lustre/llite/lloop.c
@@ -94,7 +94,6 @@
 #include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/swap.h>
 #include <linux/slab.h>
 #include <linux/suspend.h>
diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 1da7ddc..e73f203 100644
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -37,7 +37,6 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/quotaops.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 5040d62..163c2a8 100644
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -43,7 +43,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <linux/version.h>
 #include <asm/system.h>
@@ -54,7 +53,6 @@
 #include <asm/uaccess.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
-#include <linux/smp_lock.h>
 /* current_is_kswapd() */
 #include <linux/swap.h>
 
diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index 4aba4f0..a85c6f2 100644
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -46,7 +46,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <linux/version.h>
 #include <asm/system.h>
@@ -59,7 +58,6 @@
 #include <asm/uaccess.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
-#include <linux/smp_lock.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c
index caf9430..e231cd2 100644
--- a/lustre/llite/statahead.c
+++ b/lustre/llite/statahead.c
@@ -37,7 +37,6 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
 
diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index d1e9f31..34ce7079 100644
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -37,7 +37,6 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/stat.h>
-#include <linux/smp_lock.h>
 #include <linux/version.h>
 #define DEBUG_SUBSYSTEM S_LLITE
 
diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
index 03a8fae..48b3fcb 100644
--- a/lustre/llite/xattr.c
+++ b/lustre/llite/xattr.c
@@ -37,7 +37,6 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #ifdef HAVE_SELINUX_IS_ENABLED
 #include <linux/selinux.h>
 #endif
diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index 95d8704..f9fd7da 100644
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -46,7 +46,6 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/jbd.h>
-#include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
 #include <linux/workqueue.h>
 #include <linux/mount.h>
diff --git a/lustre/obdclass/linux/linux-module.c b/lustre/obdclass/linux/linux-module.c
index 5c85087..e585a47 100644
--- a/lustre/obdclass/linux/linux-module.c
+++ b/lustre/obdclass/linux/linux-module.c
@@ -69,7 +69,6 @@
 #include <asm/poll.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/smp_lock.h>
 #include <linux/seq_file.h>
 #else
 # include <liblustre.h>
diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index 91008c9..e2cd921 100644
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -55,6 +55,9 @@
 #include <lustre_log.h>
 #include <lustre_disk.h>
 #include <lustre_param.h>
+#ifdef HAVE_KERNEL_LOCKED
+#include <linux/smp_lock.h>
+#endif
 
 static int (*client_fill_super)(struct super_block *sb,
                                 struct vfsmount *mnt) = NULL;
diff --git a/lustre/osd-ldiskfs/osd_iam.c b/lustre/osd-ldiskfs/osd_iam.c
index faf99ac..49f56de 100644
--- a/lustre/osd-ldiskfs/osd_iam.c
+++ b/lustre/osd-ldiskfs/osd_iam.c
@@ -112,7 +112,6 @@
 #include <linux/string.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
-#include <linux/smp_lock.h>
 #include "osd_internal.h"
 
 #include "xattr.h"
diff --git a/lustre/quota/quota_adjust_qunit.c b/lustre/quota/quota_adjust_qunit.c
index d1426f7..4659f21 100644
--- a/lustre/quota/quota_adjust_qunit.c
+++ b/lustre/quota/quota_adjust_qunit.c
@@ -43,7 +43,6 @@
 # include <linux/fs.h>
 # include <linux/jbd.h>
 # include <linux/quota.h>
-# include <linux/smp_lock.h>
 # include <linux/buffer_head.h>
 # include <linux/workqueue.h>
 # include <linux/mount.h>
diff --git a/lustre/quota/quota_check.c b/lustre/quota/quota_check.c
index 335eb77..4b78e48c 100644
--- a/lustre/quota/quota_check.c
+++ b/lustre/quota/quota_check.c
@@ -43,7 +43,6 @@
 # include <linux/fs.h>
 # include <linux/jbd.h>
 # include <linux/ext3_fs.h>
-# include <linux/smp_lock.h>
 # include <linux/buffer_head.h>
 # include <linux/workqueue.h>
 # include <linux/mount.h>
diff --git a/lustre/quota/quota_ctl.c b/lustre/quota/quota_ctl.c
index 47f8010..99d30f4 100644
--- a/lustre/quota/quota_ctl.c
+++ b/lustre/quota/quota_ctl.c
@@ -43,7 +43,6 @@
 # include <linux/fs.h>
 # include <linux/jbd.h>
 # include <linux/quota.h>
-# include <linux/smp_lock.h>
 # include <linux/buffer_head.h>
 # include <linux/workqueue.h>
 # include <linux/mount.h>
diff --git a/lustre/quota/quota_interface.c b/lustre/quota/quota_interface.c
index 77b10ec..3cb5cf2f 100644
--- a/lustre/quota/quota_interface.c
+++ b/lustre/quota/quota_interface.c
@@ -42,7 +42,6 @@
 # include <linux/init.h>
 # include <linux/fs.h>
 # include <linux/jbd.h>
-# include <linux/smp_lock.h>
 # include <linux/buffer_head.h>
 # include <linux/workqueue.h>
 # include <linux/mount.h>
-- 
1.8.3.1