From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Tue, 20 Oct 2009 14:30:33 +0000 (+0100)
Subject: Use real names for page lock operations
X-Git-Tag: openafs-devel-1_5_66~25
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=54d9c6cb34af3da75831b4b8c68cb40475eee1ea;p=packages%2Fo%2Fopenafs.git

Use real names for page lock operations

Call a spade a spade. Don't use macros to rename lock_page as LockPage,
and unlock_page as UnlockPage. Instead use the same names as the kernel,
which makes it a lot easier for people familiar with kernel code to read
ours.

Reviewed-on: http://gerrit.openafs.org/692
Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index bd2745da6..516ce63c2 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -49,8 +49,6 @@
 #define MAX_ERRNO 1000L
 #endif
 
-#define LockPage(pp) lock_page(pp)
-#define UnlockPage(pp) unlock_page(pp)
 extern struct backing_dev_info afs_backing_dev_info;
 
 extern struct vcache *afs_globalVp;
@@ -1447,7 +1445,7 @@ afs_linux_read_cache(struct file *cachefp, struct page *page,
 	    SetPageUptodate(page);
 
 	    if (task)
-		UnlockPage(page);
+		unlock_page(page);
         } else if (task) {
 	    afs_pagecopy_queue_page(task, cachepage, page);
 	} else {
@@ -1456,7 +1454,7 @@ afs_linux_read_cache(struct file *cachefp, struct page *page,
     }
 
     if (code && task) {
-        UnlockPage(page);
+        unlock_page(page);
     }
 
 out:
@@ -1727,7 +1725,7 @@ afs_linux_bypass_readpages(struct file *fp, struct address_space *mapping,
 	isize = (i_size_read(fp->f_mapping->host) - 1) >> PAGE_CACHE_SHIFT;
 	if(pp->index > isize) {
 	    if(PageLocked(pp))
-		UnlockPage(pp);
+		unlock_page(pp);
 	    continue;
 	}
 
@@ -1740,7 +1738,7 @@ afs_linux_bypass_readpages(struct file *fp, struct address_space *mapping,
         code = add_to_page_cache(pp, mapping, pp->index, GFP_KERNEL);
         if(base_index != pp->index) {
             if(PageLocked(pp))
-				 UnlockPage(pp);
+		 unlock_page(pp);
             page_cache_release(pp);
 	    iovecp[page_ix].iov_base = (void *) 0;
 	    base_index++;
@@ -1749,13 +1747,13 @@ afs_linux_bypass_readpages(struct file *fp, struct address_space *mapping,
         base_index++;
         if(code) {
 	    if(PageLocked(pp))
-		UnlockPage(pp);
+		unlock_page(pp);
 	    page_cache_release(pp);
 	    iovecp[page_ix].iov_base = (void *) 0;
 	} else {
 	    page_count++;
 	    if(!PageLocked(pp)) {
-		LockPage(pp);
+		lock_page(pp);
 	    }
 
 	    /* save the page for background map */
@@ -1884,7 +1882,7 @@ afs_linux_readpage(struct file *fp, struct page *pp)
 	code = afs_linux_fillpage(fp, pp);
 	if (!code)
 	    code = afs_linux_prefetch(fp, pp);
-	UnlockPage(pp);
+	unlock_page(pp);
     }
 
     return code;
@@ -2090,7 +2088,7 @@ done:
     SetPageUptodate(pp);
     if ( status != AOP_WRITEPAGE_ACTIVATE ) {
 	/* XXX - do we need to redirty the page here? */
-	UnlockPage(pp);
+	unlock_page(pp);
     }
 
     page_cache_release(pp);
@@ -2241,7 +2239,7 @@ afs_symlink_filler(struct file *file, struct page *page)
 
     SetPageUptodate(page);
     kunmap(page);
-    UnlockPage(page);
+    unlock_page(page);
     return 0;
 
   fail:
@@ -2249,7 +2247,7 @@ afs_symlink_filler(struct file *file, struct page *page)
 
     SetPageError(page);
     kunmap(page);
-    UnlockPage(page);
+    unlock_page(page);
     return code;
 }