X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fllite_close.c;h=26a2c8cc2322c05dbfd200429d3b3e3b0371e00d;hb=a7811634d45319dc3812fa652c727367fa290a24;hp=d2a6b0bb512874115bfc569a36455630e55ac85f;hpb=adb6cea0b70ac465b2a47635d9dc45d64ab1605b;p=fs%2Flustre-release.git

diff --git a/lustre/llite/llite_close.c b/lustre/llite/llite_close.c
index d2a6b0b..26a2c8c 100644
--- a/lustre/llite/llite_close.c
+++ b/lustre/llite/llite_close.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,41 +42,40 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-//#include <lustre_mdc.h>
 #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)
 {
-        struct ll_inode_info *lli = ll_i2info(club->cob_inode);
-
-        ENTRY;
-        cfs_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);
-        cfs_spin_unlock(&lli->lli_lock);
-        EXIT;
+	struct ll_inode_info *lli = ll_i2info(club->cob_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);
+	spin_unlock(&lli->lli_lock);
+	EXIT;
 }
 
 /** records that a write has completed */
 void vvp_write_complete(struct ccc_object *club, struct ccc_page *page)
 {
-        struct ll_inode_info *lli = ll_i2info(club->cob_inode);
-        int rc = 0;
-
-        ENTRY;
-        cfs_spin_lock(&lli->lli_lock);
-        if (page != NULL && !cfs_list_empty(&page->cpg_pending_linkage)) {
-                cfs_list_del_init(&page->cpg_pending_linkage);
-                rc = 1;
-        }
-        cfs_spin_unlock(&lli->lli_lock);
-        if (rc)
-                ll_queue_done_writing(club->cob_inode, 0);
-        EXIT;
+	struct ll_inode_info *lli = ll_i2info(club->cob_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);
+		rc = 1;
+	}
+	spin_unlock(&lli->lli_lock);
+	if (rc)
+		ll_queue_done_writing(club->cob_inode, 0);
+	EXIT;
 }
 
 /** Queues DONE_WRITING if
@@ -84,11 +83,11 @@ void vvp_write_complete(struct ccc_object *club, struct ccc_page *page)
  * - inode has no no dirty pages; */
 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);
-        ENTRY;
+	struct ll_inode_info *lli = ll_i2info(inode);
+	struct ccc_object *club = cl2ccc(ll_i2info(inode)->lli_clob);
+	ENTRY;
 
-        cfs_spin_lock(&lli->lli_lock);
+	spin_lock(&lli->lli_lock);
         lli->lli_flags |= flags;
 
         if ((lli->lli_flags & LLIF_DONE_WRITING) &&
@@ -96,12 +95,12 @@ void ll_queue_done_writing(struct inode *inode, unsigned long flags)
                 struct ll_close_queue *lcq = ll_i2sbi(inode)->ll_lcq;
 
                 if (lli->lli_flags & LLIF_MDS_SIZE_LOCK)
-                         CWARN("ino %lu/%u(flags %lu) som valid it just after "
-                               "recovery\n",
-                               inode->i_ino, inode->i_generation,
-                               lli->lli_flags);
+                        CWARN("ino %lu/%u(flags %u) som valid it just after "
+                              "recovery\n",
+                              inode->i_ino, inode->i_generation,
+                              lli->lli_flags);
                 /* DONE_WRITING is allowed and inode has no dirty page. */
-                cfs_spin_lock(&lcq->lcq_lock);
+		spin_lock(&lcq->lcq_lock);
 
                 LASSERT(cfs_list_empty(&lli->lli_close_list));
                 CDEBUG(D_INODE, "adding inode %lu/%u to close list\n",
@@ -117,10 +116,10 @@ void ll_queue_done_writing(struct inode *inode, unsigned long flags)
                 lli->lli_flags &= ~LLIF_DONE_WRITING;
 
                 cfs_waitq_signal(&lcq->lcq_waitq);
-                cfs_spin_unlock(&lcq->lcq_lock);
-        }
-        cfs_spin_unlock(&lli->lli_lock);
-        EXIT;
+		spin_unlock(&lcq->lcq_lock);
+	}
+	spin_unlock(&lli->lli_lock);
+	EXIT;
 }
 
 /** Pack SOM attributes info @opdata for CLOSE, DONE_WRITING rpc. */
@@ -132,7 +131,7 @@ void ll_done_writing_attr(struct inode *inode, struct md_op_data *op_data)
         op_data->op_flags |= MF_SOM_CHANGE;
         /* Check if Size-on-MDS attributes are valid. */
         if (lli->lli_flags & LLIF_MDS_SIZE_LOCK)
-                CERROR("ino %lu/%u(flags %lu) som valid it just after "
+                CERROR("ino %lu/%u(flags %u) som valid it just after "
                        "recovery\n", inode->i_ino, inode->i_generation,
                        lli->lli_flags);
 
@@ -146,22 +145,22 @@ void ll_done_writing_attr(struct inode *inode, struct md_op_data *op_data)
 
 /** Closes ioepoch and packs Size-on-MDS attribute if needed into @op_data. */
 void ll_ioepoch_close(struct inode *inode, struct md_op_data *op_data,
-                      struct obd_client_handle **och, unsigned long flags)
+		      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);
-        ENTRY;
-
-        cfs_spin_lock(&lli->lli_lock);
-        if (!(cfs_list_empty(&club->cob_pending_list))) {
-                if (!(lli->lli_flags & LLIF_EPOCH_PENDING)) {
-                        LASSERT(*och != NULL);
-                        LASSERT(lli->lli_pending_och == NULL);
-                        /* Inode is dirty and there is no pending write done
-                         * request yet, DONE_WRITE is to be sent later. */
-                        lli->lli_flags |= LLIF_EPOCH_PENDING;
-                        lli->lli_pending_och = *och;
-                        cfs_spin_unlock(&lli->lli_lock);
+	struct ll_inode_info *lli = ll_i2info(inode);
+	struct ccc_object *club = cl2ccc(ll_i2info(inode)->lli_clob);
+	ENTRY;
+
+	spin_lock(&lli->lli_lock);
+	if (!(cfs_list_empty(&club->cob_pending_list))) {
+		if (!(lli->lli_flags & LLIF_EPOCH_PENDING)) {
+			LASSERT(*och != NULL);
+			LASSERT(lli->lli_pending_och == NULL);
+			/* Inode is dirty and there is no pending write done
+			 * request yet, DONE_WRITE is to be sent later. */
+			lli->lli_flags |= LLIF_EPOCH_PENDING;
+			lli->lli_pending_och = *och;
+			spin_unlock(&lli->lli_lock);
 
                         inode = igrab(inode);
                         LASSERT(inode);
@@ -173,7 +172,7 @@ void ll_ioepoch_close(struct inode *inode, struct md_op_data *op_data,
                          * and try DONE_WRITE again later. */
                         LASSERT(!(lli->lli_flags & LLIF_DONE_WRITING));
                         lli->lli_flags |= LLIF_DONE_WRITING;
-                        cfs_spin_unlock(&lli->lli_lock);
+			spin_unlock(&lli->lli_lock);
 
                         inode = igrab(inode);
                         LASSERT(inode);
@@ -193,26 +192,26 @@ void ll_ioepoch_close(struct inode *inode, struct md_op_data *op_data,
         } else {
                 /* Pack Size-on-MDS inode attributes only if they has changed */
                 if (!(lli->lli_flags & LLIF_SOM_DIRTY)) {
-                        cfs_spin_unlock(&lli->lli_lock);
-                        GOTO(out, 0);
-                }
-
-                /* There is a pending DONE_WRITE -- close epoch with no
-                 * attribute change. */
-                if (lli->lli_flags & LLIF_EPOCH_PENDING) {
-                        cfs_spin_unlock(&lli->lli_lock);
-                        GOTO(out, 0);
-                }
-        }
-
-        LASSERT(cfs_list_empty(&club->cob_pending_list));
-        lli->lli_flags &= ~LLIF_SOM_DIRTY;
-        cfs_spin_unlock(&lli->lli_lock);
-        ll_done_writing_attr(inode, op_data);
-
-        EXIT;
+			spin_unlock(&lli->lli_lock);
+			GOTO(out, 0);
+		}
+
+		/* There is a pending DONE_WRITE -- close epoch with no
+		 * attribute change. */
+		if (lli->lli_flags & LLIF_EPOCH_PENDING) {
+			spin_unlock(&lli->lli_lock);
+			GOTO(out, 0);
+		}
+	}
+
+	LASSERT(cfs_list_empty(&club->cob_pending_list));
+	lli->lli_flags &= ~LLIF_SOM_DIRTY;
+	spin_unlock(&lli->lli_lock);
+	ll_done_writing_attr(inode, op_data);
+
+	EXIT;
 out:
-        return;
+	return;
 }
 
 /**
@@ -230,7 +229,7 @@ int ll_som_update(struct inode *inode, struct md_op_data *op_data)
 
         LASSERT(op_data != NULL);
         if (lli->lli_flags & LLIF_MDS_SIZE_LOCK)
-                CERROR("ino %lu/%u(flags %lu) som valid it just after "
+                CERROR("ino %lu/%u(flags %u) som valid it just after "
                        "recovery\n", inode->i_ino, inode->i_generation,
                        lli->lli_flags);
 
@@ -249,10 +248,7 @@ int ll_som_update(struct inode *inode, struct md_op_data *op_data)
                                       old_flags & MF_GETATTR_LOCK);
                 if (rc) {
                         oa->o_valid = 0;
-                        if (rc == -ENOENT)
-                                CDEBUG(D_INODE, "objid "LPX64" is destroyed\n",
-                                       lli->lli_smd->lsm_object_id);
-                        else
+			if (rc != -ENOENT)
                                 CERROR("inode_getattr failed (%d): unable to "
                                        "send a Size-on-MDS attribute update "
                                        "for inode %lu/%u\n", rc, inode->i_ino,
@@ -333,9 +329,9 @@ out:
 
 static struct ll_inode_info *ll_close_next_lli(struct ll_close_queue *lcq)
 {
-        struct ll_inode_info *lli = NULL;
+	struct ll_inode_info *lli = NULL;
 
-        cfs_spin_lock(&lcq->lcq_lock);
+	spin_lock(&lcq->lcq_lock);
 
         if (!cfs_list_empty(&lcq->lcq_head)) {
                 lli = cfs_list_entry(lcq->lcq_head.next, struct ll_inode_info,
@@ -344,8 +340,8 @@ static struct ll_inode_info *ll_close_next_lli(struct ll_close_queue *lcq)
         } else if (cfs_atomic_read(&lcq->lcq_stop))
                 lli = ERR_PTR(-EALREADY);
 
-        cfs_spin_unlock(&lcq->lcq_lock);
-        return lli;
+	spin_unlock(&lcq->lcq_lock);
+	return lli;
 }
 
 static int ll_close_thread(void *arg)
@@ -359,7 +355,7 @@ static int ll_close_thread(void *arg)
                 cfs_daemonize(name);
         }
 
-        cfs_complete(&lcq->lcq_comp);
+	complete(&lcq->lcq_comp);
 
         while (1) {
                 struct l_wait_info lwi = { 0 };
@@ -380,8 +376,8 @@ static int ll_close_thread(void *arg)
         }
 
         CDEBUG(D_INFO, "ll_close exiting\n");
-        cfs_complete(&lcq->lcq_comp);
-        RETURN(0);
+	complete(&lcq->lcq_comp);
+	RETURN(0);
 }
 
 int ll_close_thread_start(struct ll_close_queue **lcq_ret)
@@ -396,27 +392,27 @@ int ll_close_thread_start(struct ll_close_queue **lcq_ret)
         if (lcq == NULL)
                 return -ENOMEM;
 
-        cfs_spin_lock_init(&lcq->lcq_lock);
-        CFS_INIT_LIST_HEAD(&lcq->lcq_head);
-        cfs_waitq_init(&lcq->lcq_waitq);
-        cfs_init_completion(&lcq->lcq_comp);
+	spin_lock_init(&lcq->lcq_lock);
+	CFS_INIT_LIST_HEAD(&lcq->lcq_head);
+	cfs_waitq_init(&lcq->lcq_waitq);
+	init_completion(&lcq->lcq_comp);
 
-        pid = cfs_create_thread(ll_close_thread, lcq, 0);
-        if (pid < 0) {
-                OBD_FREE(lcq, sizeof(*lcq));
-                return pid;
-        }
+	pid = cfs_create_thread(ll_close_thread, lcq, 0);
+	if (pid < 0) {
+		OBD_FREE(lcq, sizeof(*lcq));
+		return pid;
+	}
 
-        cfs_wait_for_completion(&lcq->lcq_comp);
-        *lcq_ret = lcq;
-        return 0;
+	wait_for_completion(&lcq->lcq_comp);
+	*lcq_ret = lcq;
+	return 0;
 }
 
 void ll_close_thread_shutdown(struct ll_close_queue *lcq)
 {
-        cfs_init_completion(&lcq->lcq_comp);
-        cfs_atomic_inc(&lcq->lcq_stop);
-        cfs_waitq_signal(&lcq->lcq_waitq);
-        cfs_wait_for_completion(&lcq->lcq_comp);
-        OBD_FREE(lcq, sizeof(*lcq));
+	init_completion(&lcq->lcq_comp);
+	cfs_atomic_inc(&lcq->lcq_stop);
+	cfs_waitq_signal(&lcq->lcq_waitq);
+	wait_for_completion(&lcq->lcq_comp);
+	OBD_FREE(lcq, sizeof(*lcq));
 }