LU-13088 ldlm: Fix sleeping function called in atomic

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

diff --git a/lustre/llite/lcommon_cl.c b/lustre/llite/lcommon_cl.c
index 21a10ec..c8e4402 100644 (file)
--- a/lustre/llite/lcommon_cl.c
+++ b/lustre/llite/lcommon_cl.c
@@ -164,8 +164,7 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md)
                if (!(inode->i_state & I_NEW)) {
                        result = -EIO;
                        CERROR("%s: unexpected not-NEW inode "DFID": rc = %d\n",
-                              ll_get_fsname(inode->i_sb, NULL, 0), PFID(fid),
-                              result);
+                              ll_i2sbi(inode)->ll_fsname, PFID(fid), result);
                        goto out;
                }
 
@@ -192,7 +191,7 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md)
 
        if (result != 0)
                CERROR("%s: failed to initialize cl_object "DFID": rc = %d\n",
-                       ll_get_fsname(inode->i_sb, NULL, 0), PFID(fid), result);
+                      ll_i2sbi(inode)->ll_fsname, PFID(fid), result);
 
 out:
        cl_env_put(env, &refcheck);
@@ -212,7 +211,6 @@ out:
 static void cl_object_put_last(struct lu_env *env, struct cl_object *obj)
 {
        struct lu_object_header *header = obj->co_lu.lo_header;
-       wait_queue_entry_t waiter;
 
        if (unlikely(atomic_read(&header->loh_ref) != 1)) {
                struct lu_site *site = obj->co_lu.lo_dev->ld_site;
@@ -220,18 +218,7 @@ static void cl_object_put_last(struct lu_env *env, struct cl_object *obj)
 
                wq = lu_site_wq_from_fid(site, &header->loh_fid);
 
-               init_waitqueue_entry(&waiter, current);
-               add_wait_queue(wq, &waiter);
-
-               while (1) {
-                       set_current_state(TASK_UNINTERRUPTIBLE);
-                       if (atomic_read(&header->loh_ref) == 1)
-                               break;
-                       schedule();
-               }
-
-               set_current_state(TASK_RUNNING);
-               remove_wait_queue(wq, &waiter);
+               wait_event(*wq, atomic_read(&header->loh_ref) == 1);
        }
 
        cl_object_put(env, obj);