X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fllite_close.c;h=7dd5e2cadbe2c70be94d2637a742ed7e4ab98a16;hb=0fab7dc89f4756538f8b67e7736abd6f225abae8;hp=c4cb15879c4160dc5ada5149ec48708552d6f97e;hpb=7ac23cacd62077674e43f0d44d660801bc1fd95d;p=fs%2Flustre-release.git

diff --git a/lustre/llite/llite_close.c b/lustre/llite/llite_close.c
index c4cb158..7dd5e2c 100644
--- a/lustre/llite/llite_close.c
+++ b/lustre/llite/llite_close.c
@@ -42,39 +42,38 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-#include <lustre_lite.h>
 #include "llite_internal.h"
 
 /** records that a write is in flight */
-void vvp_write_pending(struct ccc_object *club, struct ccc_page *page)
+void vvp_write_pending(struct vvp_object *club, struct vvp_page *page)
 {
-	struct ll_inode_info *lli = ll_i2info(club->cob_inode);
+	struct ll_inode_info *lli = ll_i2info(club->vob_inode);
 
 	ENTRY;
 	spin_lock(&lli->lli_lock);
 	lli->lli_flags |= LLIF_SOM_DIRTY;
-	if (page != NULL && cfs_list_empty(&page->cpg_pending_linkage))
-		cfs_list_add(&page->cpg_pending_linkage,
-			     &club->cob_pending_list);
+	if (page != NULL && list_empty(&page->vpg_pending_linkage))
+		list_add(&page->vpg_pending_linkage,
+			     &club->vob_pending_list);
 	spin_unlock(&lli->lli_lock);
 	EXIT;
 }
 
 /** records that a write has completed */
-void vvp_write_complete(struct ccc_object *club, struct ccc_page *page)
+void vvp_write_complete(struct vvp_object *club, struct vvp_page *page)
 {
-	struct ll_inode_info *lli = ll_i2info(club->cob_inode);
+	struct ll_inode_info *lli = ll_i2info(club->vob_inode);
 	int rc = 0;
 
 	ENTRY;
 	spin_lock(&lli->lli_lock);
-	if (page != NULL && !cfs_list_empty(&page->cpg_pending_linkage)) {
-		cfs_list_del_init(&page->cpg_pending_linkage);
+	if (page != NULL && !list_empty(&page->vpg_pending_linkage)) {
+		list_del_init(&page->vpg_pending_linkage);
 		rc = 1;
 	}
 	spin_unlock(&lli->lli_lock);
 	if (rc)
-		ll_queue_done_writing(club->cob_inode, 0);
+		ll_queue_done_writing(club->vob_inode, 0);
 	EXIT;
 }
 
@@ -84,14 +83,14 @@ void vvp_write_complete(struct ccc_object *club, struct ccc_page *page)
 void ll_queue_done_writing(struct inode *inode, unsigned long flags)
 {
 	struct ll_inode_info *lli = ll_i2info(inode);
-	struct ccc_object *club = cl2ccc(ll_i2info(inode)->lli_clob);
+	struct vvp_object *club = cl2vvp(ll_i2info(inode)->lli_clob);
 	ENTRY;
 
 	spin_lock(&lli->lli_lock);
         lli->lli_flags |= flags;
 
         if ((lli->lli_flags & LLIF_DONE_WRITING) &&
-            cfs_list_empty(&club->cob_pending_list)) {
+	    list_empty(&club->vob_pending_list)) {
                 struct ll_close_queue *lcq = ll_i2sbi(inode)->ll_lcq;
 
                 if (lli->lli_flags & LLIF_MDS_SIZE_LOCK)
@@ -102,10 +101,10 @@ void ll_queue_done_writing(struct inode *inode, unsigned long flags)
 		/* DONE_WRITING is allowed and inode has no dirty page. */
 		spin_lock(&lcq->lcq_lock);
 
-		LASSERT(cfs_list_empty(&lli->lli_close_list));
+		LASSERT(list_empty(&lli->lli_close_list));
 		CDEBUG(D_INODE, "adding inode "DFID" to close list\n",
 		       PFID(ll_inode2fid(inode)));
-                cfs_list_add_tail(&lli->lli_close_list, &lcq->lcq_head);
+		list_add_tail(&lli->lli_close_list, &lcq->lcq_head);
 
 		/* Avoid a concurrent insertion into the close thread queue:
 		 * an inode is already in the close thread, open(), write(),
@@ -149,11 +148,11 @@ void ll_ioepoch_close(struct inode *inode, struct md_op_data *op_data,
 		      struct obd_client_handle **och, unsigned long flags)
 {
 	struct ll_inode_info *lli = ll_i2info(inode);
-	struct ccc_object *club = cl2ccc(ll_i2info(inode)->lli_clob);
+	struct vvp_object *club = cl2vvp(ll_i2info(inode)->lli_clob);
 	ENTRY;
 
 	spin_lock(&lli->lli_lock);
-	if (!(cfs_list_empty(&club->cob_pending_list))) {
+	if (!(list_empty(&club->vob_pending_list))) {
 		if (!(lli->lli_flags & LLIF_EPOCH_PENDING)) {
 			LASSERT(*och != NULL);
 			LASSERT(lli->lli_pending_och == NULL);
@@ -205,7 +204,7 @@ void ll_ioepoch_close(struct inode *inode, struct md_op_data *op_data,
 		}
 	}
 
-	LASSERT(cfs_list_empty(&club->cob_pending_list));
+	LASSERT(list_empty(&club->vob_pending_list));
 	lli->lli_flags &= ~LLIF_SOM_DIRTY;
 	spin_unlock(&lli->lli_lock);
 	ll_done_writing_attr(inode, op_data);
@@ -337,12 +336,12 @@ static struct ll_inode_info *ll_close_next_lli(struct ll_close_queue *lcq)
 
 	spin_lock(&lcq->lcq_lock);
 
-        if (!cfs_list_empty(&lcq->lcq_head)) {
-                lli = cfs_list_entry(lcq->lcq_head.next, struct ll_inode_info,
-                                     lli_close_list);
-                cfs_list_del_init(&lli->lli_close_list);
-        } else if (cfs_atomic_read(&lcq->lcq_stop))
-                lli = ERR_PTR(-EALREADY);
+	if (!list_empty(&lcq->lcq_head)) {
+		lli = list_entry(lcq->lcq_head.next, struct ll_inode_info,
+				 lli_close_list);
+		list_del_init(&lli->lli_close_list);
+	} else if (atomic_read(&lcq->lcq_stop))
+		lli = ERR_PTR(-EALREADY);
 
 	spin_unlock(&lcq->lcq_lock);
 	return lli;
@@ -391,7 +390,7 @@ int ll_close_thread_start(struct ll_close_queue **lcq_ret)
 		return -ENOMEM;
 
 	spin_lock_init(&lcq->lcq_lock);
-	CFS_INIT_LIST_HEAD(&lcq->lcq_head);
+	INIT_LIST_HEAD(&lcq->lcq_head);
 	init_waitqueue_head(&lcq->lcq_waitq);
 	init_completion(&lcq->lcq_comp);
 
@@ -409,7 +408,7 @@ int ll_close_thread_start(struct ll_close_queue **lcq_ret)
 void ll_close_thread_shutdown(struct ll_close_queue *lcq)
 {
 	init_completion(&lcq->lcq_comp);
-	cfs_atomic_inc(&lcq->lcq_stop);
+	atomic_inc(&lcq->lcq_stop);
 	wake_up(&lcq->lcq_waitq);
 	wait_for_completion(&lcq->lcq_comp);
 	OBD_FREE(lcq, sizeof(*lcq));