From: adilger <adilger>
Date: Mon, 11 Mar 2002 19:45:31 +0000 (+0000)
Subject: Unlock page in lustre_prepare_page() if there is an error.
X-Git-Tag: 0.4.2~541
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=927d64ee9d224239a74bfd382f8aa6320a1dc5f0;p=fs%2Flustre-release.git

Unlock page in lustre_prepare_page() if there is an error.
---

diff --git a/lustre/lib/page.c b/lustre/lib/page.c
index ecd00d3..f7f72eb 100644
--- a/lustre/lib/page.c
+++ b/lustre/lib/page.c
@@ -83,9 +83,9 @@ inline void lustre_put_page(struct page *page)
 	page_cache_release(page);
 }
 
-struct page * lustre_get_page(struct inode *dir, unsigned long n)
+struct page * lustre_get_page(struct inode *inode, unsigned long n)
 {
-	struct address_space *mapping = dir->i_mapping;
+	struct address_space *mapping = inode->i_mapping;
 	struct page *page = read_cache_page(mapping, n,
 				(filler_t*)mapping->a_ops->readpage, NULL);
 	if (!IS_ERR(page)) {
@@ -109,23 +109,24 @@ int lustre_prepare_page(unsigned from, unsigned to, struct page *page)
 
 	lock_page(page);
 	err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
-	if (err) { 
-                CERROR("page index %ld from %d to %d err %d\n", 
-                                page->index, from, to, err); 
+        if (err) {
+                unlock_page(page);
+                CERROR("page index %ld from %d to %d err %d\n",
+                                page->index, from, to, err);
         }
         return err;
 }
 
 int lustre_commit_page(struct page *page, unsigned from, unsigned to)
 {
-	struct inode *dir = page->mapping->host;
+        struct inode *inode = page->mapping->host;
 	int err = 0;
 
 	SetPageUptodate(page);
 	set_page_clean(page);
 
 	page->mapping->a_ops->commit_write(NULL, page, from, to);
-	if (IS_SYNC(dir))
+        if (IS_SYNC(inode))
 		err = waitfor_one_page(page);
 	UnlockPage(page);
 	lustre_put_page(page);