X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fllite%2Fllite_lib.c;fp=lustre%2Fllite%2Fllite_lib.c;h=3b9809e7f0fba801777b2f1465b241692a8c5500;hb=a9a1e19b0f55e2f54a6b1384af41707d951033da;hp=80b32939d02abcbba41eaf2c5452a6b0ecb18b46;hpb=bd5719972b1f44f9db8a6f26a55225145e05288c;p=fs%2Flustre-release.git

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 80b3293..3b9809e 100644
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -1427,7 +1427,7 @@ static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
 		lsm_md_dump(D_ERROR, lsm);
 		GOTO(unlock, rc = -EINVAL);
 	}
-  
+
 	up_read(&lli->lli_lsm_sem);
 	down_write(&lli->lli_lsm_sem);
 	/* clear existing lsm */
@@ -1440,7 +1440,7 @@ static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
 	up_write(&lli->lli_lsm_sem);
 	if (rc)
 		RETURN(rc);
- 
+
 	/* set md->lmv to NULL, so the following free lustre_md will not free
 	 * this lsm.
 	 */
@@ -1453,7 +1453,7 @@ static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
 	OBD_ALLOC_PTR(attr);
 	if (!attr)
 		GOTO(unlock, rc = -ENOMEM);
- 
+
 	/* validate the lsm */
 	rc = md_merge_attr(ll_i2mdexp(inode), lli->lli_lsm_md, attr,
 			   ll_md_blocking_ast);
@@ -2053,6 +2053,34 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md)
 	return 0;
 }
 
+void ll_truncate_inode_pages_final(struct inode *inode)
+{
+	struct address_space *mapping = &inode->i_data;
+	unsigned long nrpages;
+	unsigned long flags;
+
+	truncate_inode_pages_final(mapping);
+
+	/* Workaround for LU-118: Note nrpages may not be totally updated when
+	 * truncate_inode_pages() returns, as there can be a page in the process
+	 * of deletion (inside __delete_from_page_cache()) in the specified
+	 * range. Thus mapping->nrpages can be non-zero when this function
+	 * returns even after truncation of the whole mapping.  Only do this if
+	 * npages isn't already zero.
+	 */
+	nrpages = mapping->nrpages;
+	if (nrpages) {
+		xa_lock_irqsave(&mapping->i_pages, flags);
+		nrpages = mapping->nrpages;
+		xa_unlock_irqrestore(&mapping->i_pages, flags);
+	} /* Workaround end */
+
+	LASSERTF(nrpages == 0, "%s: inode="DFID"(%p) nrpages=%lu, "
+		 "see https://jira.whamcloud.com/browse/LU-118\n",
+		 ll_get_fsname(inode->i_sb, NULL, 0),
+		 PFID(ll_inode2fid(inode)), inode, nrpages);
+}
+
 int ll_read_inode2(struct inode *inode, void *opaque)
 {
         struct lustre_md *md = opaque;
@@ -2110,8 +2138,6 @@ int ll_read_inode2(struct inode *inode, void *opaque)
 void ll_delete_inode(struct inode *inode)
 {
 	struct ll_inode_info *lli = ll_i2info(inode);
-	struct address_space *mapping = &inode->i_data;
-	unsigned long nrpages;
 	ENTRY;
 
 	if (S_ISREG(inode->i_mode) && lli->lli_clob != NULL) {
@@ -2125,26 +2151,8 @@ void ll_delete_inode(struct inode *inode)
 		cl_sync_file_range(inode, 0, OBD_OBJECT_EOF, inode->i_nlink ?
 				   CL_FSYNC_LOCAL : CL_FSYNC_DISCARD, 1);
 	}
-	truncate_inode_pages_final(mapping);
 
-	/* Workaround for LU-118: Note nrpages may not be totally updated when
-	 * truncate_inode_pages() returns, as there can be a page in the process
-	 * of deletion (inside __delete_from_page_cache()) in the specified
-	 * range. Thus mapping->nrpages can be non-zero when this function
-	 * returns even after truncation of the whole mapping.  Only do this if
-	 * npages isn't already zero.
-	 */
-	nrpages = mapping->nrpages;
-	if (nrpages) {
-		xa_lock_irq(&mapping->i_pages);
-		nrpages = mapping->nrpages;
-		xa_unlock_irq(&mapping->i_pages);
-	} /* Workaround end */
-
-	LASSERTF(nrpages == 0, "%s: inode="DFID"(%p) nrpages=%lu, "
-		 "see https://jira.whamcloud.com/browse/LU-118\n",
-		 ll_get_fsname(inode->i_sb, NULL, 0),
-		 PFID(ll_inode2fid(inode)), inode, nrpages);
+	ll_truncate_inode_pages_final(inode);
 
 #ifdef HAVE_SBOPS_EVICT_INODE
 	ll_clear_inode(inode);