LU-4423 llite: use 64-bit times in another debug print

[fs/lustre-release.git] / lustre / llite / llite_lib.c

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index f395747..4d80ff5 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -219,7 +215,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
                                  OBD_CONNECT_DIR_STRIPE |
                                  OBD_CONNECT_BULK_MBITS |
                                  OBD_CONNECT_SUBTREE |
-                                 OBD_CONNECT_FLAGS2;
+                                 OBD_CONNECT_FLAGS2 | OBD_CONNECT_MULTIMODRPCS;
 
        data->ocd_connect_flags2 = 0;
 
@@ -326,11 +322,12 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
        }
 
        LASSERT(osfs->os_bsize);
-        sb->s_blocksize = osfs->os_bsize;
-        sb->s_blocksize_bits = log2(osfs->os_bsize);
-        sb->s_magic = LL_SUPER_MAGIC;
-        sb->s_maxbytes = MAX_LFS_FILESIZE;
-        sbi->ll_namelen = osfs->os_namelen;
+       sb->s_blocksize = osfs->os_bsize;
+       sb->s_blocksize_bits = log2(osfs->os_bsize);
+       sb->s_magic = LL_SUPER_MAGIC;
+       sb->s_maxbytes = MAX_LFS_FILESIZE;
+       sbi->ll_namelen = osfs->os_namelen;
+       sbi->ll_mnt.mnt = current->fs->root.mnt;
 
         if ((sbi->ll_flags & LL_SBI_USER_XATTR) &&
             !(data->ocd_connect_flags & OBD_CONNECT_XATTR)) {
@@ -958,6 +955,7 @@ void ll_lli_init(struct ll_inode_info *lli)
                lli->lli_async_rc = 0;
        }
        mutex_init(&lli->lli_layout_mutex);
+       memset(lli->lli_jobid, 0, LUSTRE_JOBID_SIZE);
 }
 
 static inline int ll_bdi_register(struct backing_dev_info *bdi)
@@ -1027,6 +1025,7 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt)
         cfg->cfg_instance = sb;
         cfg->cfg_uuid = lsi->lsi_llsbi->ll_sb_uuid;
        cfg->cfg_callback = class_config_llog_handler;
+       cfg->cfg_sub_clds = CONFIG_SUB_CLIENT;
         /* set up client obds */
         err = lustre_process_log(sb, profilenm, cfg);
        if (err < 0)
@@ -1601,9 +1600,9 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
         }
 
         if (attr->ia_valid & (ATTR_MTIME | ATTR_CTIME))
-                CDEBUG(D_INODE, "setting mtime %lu, ctime %lu, now = %lu\n",
+               CDEBUG(D_INODE, "setting mtime %lu, ctime %lu, now = %llu\n",
                        LTIME_S(attr->ia_mtime), LTIME_S(attr->ia_ctime),
-                       cfs_time_current_sec());
+                      (s64)ktime_get_real_seconds());
 
        if (S_ISREG(inode->i_mode)) {
                if (attr->ia_valid & ATTR_SIZE)
@@ -2132,6 +2131,8 @@ void ll_umount_begin(struct super_block *sb)
        struct ll_sb_info *sbi = ll_s2sbi(sb);
        struct obd_device *obd;
        struct obd_ioctl_data *ioc_data;
+       struct l_wait_info lwi;
+       wait_queue_head_t waitq;
        ENTRY;
 
        CDEBUG(D_VFSTRACE, "VFS Op: superblock %p count %d active %d\n", sb,
@@ -2167,10 +2168,14 @@ void ll_umount_begin(struct super_block *sb)
        }
 
        /* Really, we'd like to wait until there are no requests outstanding,
-        * and then continue.  For now, we just invalidate the requests,
-        * schedule() and sleep one second if needed, and hope.
+        * and then continue.  For now, we just periodically checking for vfs
+        * to decrement mnt_cnt and hope to finish it within 10sec.
         */
-       schedule();
+       init_waitqueue_head(&waitq);
+       lwi = LWI_TIMEOUT_INTERVAL(cfs_time_seconds(10),
+                                  cfs_time_seconds(1), NULL, NULL);
+       l_wait_event(waitq, may_umount(sbi->ll_mnt.mnt), &lwi);
+
        EXIT;
 }
 
@@ -2241,7 +2246,7 @@ void ll_open_cleanup(struct super_block *sb, struct ptlrpc_request *open_req)
 
        op_data->op_fid1 = body->mbo_fid1;
        op_data->op_handle = body->mbo_handle;
-       op_data->op_mod_time = cfs_time_current_sec();
+       op_data->op_mod_time = ktime_get_real_seconds();
        md_close(exp, op_data, NULL, &close_req);
        ptlrpc_req_finished(close_req);
        ll_finish_md_op_data(op_data);
@@ -2660,7 +2665,7 @@ void ll_compute_rootsquash_state(struct ll_sb_info *sbi)
        struct root_squash_info *squash = &sbi->ll_squash;
        int i;
        bool matched;
-       lnet_process_id_t id;
+       struct lnet_process_id id;
 
        /* Update norootsquash flag */
        down_write(&squash->rsi_sem);
@@ -2705,7 +2710,7 @@ static int ll_linkea_decode(struct linkea_data *ldata, unsigned int linkno,
        int             rc;
        ENTRY;
 
-       rc = linkea_init(ldata);
+       rc = linkea_init_with_rec(ldata);
        if (rc < 0)
                RETURN(rc);