b=13677

r=eeb,adilger

wait for async rpc completion in liblustre

diff --git a/lustre/liblustre/file.c b/lustre/liblustre/file.c
index 680c0e2..bd67c0f 100644 (file)
--- a/lustre/liblustre/file.c
+++ b/lustre/liblustre/file.c
@@ -436,7 +436,7 @@ int llu_iop_close(struct inode *inode)
         }
         /* if open count == 0 && stale_flag is set, should we
          * remove the inode immediately? */
-        liblustre_wait_event(0);
+        liblustre_wait_idle();
         return 0;
 }
 

diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c
index ad7e222..e3bb0ff 100644 (file)
--- a/lustre/liblustre/super.c
+++ b/lustre/liblustre/super.c
@@ -846,7 +846,7 @@ static int llu_iop_setattr(struct pnode *pno,
         iattr.ia_ctime = CURRENT_TIME;
 
         rc = llu_setattr_raw(ino, &iattr);
-        liblustre_wait_event(0);
+        liblustre_wait_idle();
         RETURN(rc);
 }
 
@@ -1060,7 +1060,7 @@ static int llu_iop_unlink_raw(struct pnode *pno)
         if (!rc)
                 rc = llu_objects_destroy(request, dir);
         ptlrpc_req_finished(request);
-        liblustre_wait_event(0);
+        liblustre_wait_idle();
 
         RETURN(rc);
 }
@@ -1091,7 +1091,7 @@ static int llu_iop_rename_raw(struct pnode *old, struct pnode *new)
         }
 
         ptlrpc_req_finished(request);
-        liblustre_wait_event(0);
+        liblustre_wait_idle();
 
         RETURN(rc);
 }