LU-12355 llite: include file linux/selinux.h removed

[fs/lustre-release.git] / lustre / obdclass / obd_mount_server.c

diff --git a/lustre/obdclass/obd_mount_server.c b/lustre/obdclass/obd_mount_server.c
index 42af490..574e487 100644 (file)
--- a/lustre/obdclass/obd_mount_server.c
+++ b/lustre/obdclass/obd_mount_server.c
@@ -43,12 +43,11 @@
 #define PRINT_MASK (D_SUPER | D_CONFIG)
 
 #include <linux/types.h>
+#ifdef HAVE_LINUX_SELINUX_IS_ENABLED
 #include <linux/selinux.h>
+#endif
 #include <linux/statfs.h>
 #include <linux/version.h>
-#ifdef HAVE_KERNEL_LOCKED
-#include <linux/smp_lock.h>
-#endif
 
 #include <llog_swab.h>
 #include <lustre_disk.h>
@@ -1233,8 +1232,7 @@ again:
                                /* The connection with MGS is not established.
                                 * Try again after 2 seconds. Interruptable. */
                                set_current_state(TASK_INTERRUPTIBLE);
-                               schedule_timeout(
-                                       msecs_to_jiffies(MSEC_PER_SEC) * 2);
+                               schedule_timeout(cfs_time_seconds(2));
                                set_current_state(TASK_RUNNING);
                                if (!signal_pending(current))
                                        goto again;
@@ -1832,7 +1830,7 @@ static int server_fill_super_common(struct super_block *sb)
        sb->s_blocksize_bits = log2(sb->s_blocksize);
        sb->s_magic = LUSTRE_SUPER_MAGIC;
        sb->s_maxbytes = 0; /* we don't allow file IO on server mountpoints */
-       sb->s_flags |= MS_RDONLY;
+       sb->s_flags |= SB_RDONLY;
        sb->s_op = &server_ops;
 
        root = new_inode(sb);