LU-12514 utils: add "lustre_tgt" filesystem type

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

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index f72c8b6..49b9d4c 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -263,7 +263,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
         if (sbi->ll_flags & LL_SBI_LRU_RESIZE)
                 data->ocd_connect_flags |= OBD_CONNECT_LRU_RESIZE;
 #endif
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
        data->ocd_connect_flags |= OBD_CONNECT_ACL | OBD_CONNECT_UMASK |
                                   OBD_CONNECT_LARGE_ACL;
 #endif
@@ -598,7 +598,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
        ptlrpc_req_finished(request);
 
        if (IS_ERR(root)) {
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
                if (lmd.posix_acl) {
                        posix_acl_release(lmd.posix_acl);
                        lmd.posix_acl = NULL;
@@ -606,7 +606,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
 #endif
                err = IS_ERR(root) ? PTR_ERR(root) : -EBADF;
                root = NULL;
-               CERROR("lustre_lite: bad iget4 for root\n");
+               CERROR("%s: bad ll_iget() for root: rc = %d\n",
+                      sbi->ll_fsname, err);
                GOTO(out_root, err);
        }
 
@@ -804,12 +805,11 @@ void ll_kill_super(struct super_block *sb)
         * put_super not affected real removing devices */
        if (sbi) {
                sb->s_dev = sbi->ll_sdev_orig;
-               sbi->ll_umounting = 1;
 
                /* wait running statahead threads to quit */
                while (atomic_read(&sbi->ll_sa_running) > 0) {
                        set_current_state(TASK_UNINTERRUPTIBLE);
-                       schedule_timeout(cfs_time_seconds(1 >> 3));
+                       schedule_timeout(cfs_time_seconds(1) >> 3);
                }
        }
 
@@ -983,7 +983,6 @@ void ll_lli_init(struct ll_inode_info *lli)
 
        LASSERT(lli->lli_vfs_inode.i_mode != 0);
        if (S_ISDIR(lli->lli_vfs_inode.i_mode)) {
-               mutex_init(&lli->lli_readdir_mutex);
                lli->lli_opendir_key = NULL;
                lli->lli_sai = NULL;
                spin_lock_init(&lli->lli_sa_lock);
@@ -1006,6 +1005,9 @@ void ll_lli_init(struct ll_inode_info *lli)
                mutex_init(&lli->lli_pcc_lock);
                lli->lli_pcc_state = PCC_STATE_FL_NONE;
                lli->lli_pcc_inode = NULL;
+               mutex_init(&lli->lli_group_mutex);
+               lli->lli_group_users = 0;
+               lli->lli_group_gid = 0;
        }
        mutex_init(&lli->lli_layout_mutex);
        memset(lli->lli_jobid, 0, sizeof(lli->lli_jobid));
@@ -1618,7 +1620,7 @@ void ll_clear_inode(struct inode *inode)
 
        ll_xattr_cache_destroy(inode);
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
        forget_all_cached_acls(inode);
        if (lli->lli_posix_acl) {
                posix_acl_release(lli->lli_posix_acl);
@@ -2066,7 +2068,7 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md)
                        return rc;
        }
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
        if (body->mbo_valid & OBD_MD_FLACL) {
                spin_lock(&lli->lli_lock);
                if (lli->lli_posix_acl)
@@ -2397,16 +2399,16 @@ void ll_umount_begin(struct super_block *sb)
        }
        obd->obd_force = 1;
 
-        obd = class_exp2obd(sbi->ll_dt_exp);
-        if (obd == NULL) {
+       obd = class_exp2obd(sbi->ll_dt_exp);
+       if (obd == NULL) {
                CERROR("Invalid LOV connection handle %#llx\n",
-                       sbi->ll_dt_exp->exp_handle.h_cookie);
-                EXIT;
-                return;
-        }
-        obd->obd_force = 1;
+                      sbi->ll_dt_exp->exp_handle.h_cookie);
+               EXIT;
+               return;
+       }
+       obd->obd_force = 1;
 
-        OBD_ALLOC_PTR(ioc_data);
+       OBD_ALLOC_PTR(ioc_data);
        if (ioc_data) {
                obd_iocontrol(IOC_OSC_SET_ACTIVE, sbi->ll_md_exp,
                              sizeof *ioc_data, ioc_data, NULL);
@@ -2551,7 +2553,7 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
                                             sbi->ll_flags & LL_SBI_32BIT_API),
                                 &md);
                if (IS_ERR(*inode)) {
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
                         if (md.posix_acl) {
                                 posix_acl_release(md.posix_acl);
                                 md.posix_acl = NULL;
@@ -2844,6 +2846,7 @@ void ll_dirty_page_discard_warn(struct page *page, int ioret)
                        path = ll_d_path(dentry, buf, PAGE_SIZE);
        }
 
+       /* The below message is checked in recovery-small.sh test_24b */
        CDEBUG(D_WARNING,
               "%s: dirty page discard: %s/fid: "DFID"/%s may get corrupted "
               "(rc %d)\n", ll_i2sbi(inode)->ll_fsname,