[Pvfs2-cvs] commit by robl in pvfs2-1/src/kernel/linux-2.6: file.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6
In directory parlweb1:/tmp/cvs-serv9180/src/kernel/linux-2.6

Modified Files:
	file.c 
Log Message:
correct the preprocessor logic


Index: file.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/file.c,v
diff -u -w -p -u -r1.140 -r1.141
--- file.c	31 Aug 2007 21:17:26 -0000	1.140
+++ file.c	31 Aug 2007 22:20:49 -0000	1.141
@@ -703,9 +703,9 @@ static long estimate_max_iovecs(const st
 
 #ifdef HAVE_OBSOLETE_STRUCT_PAGE_COUNT_NO_UNDERSCORE
 #define pg_ref_count(pg) atomic_read(&(pg)->count)
-#endif
-
+#else
 #define pg_ref_count(pg) atomic_read(&(pg)->_count)
+#endif
 /*
  * Cleaning up pages in the cache involves dropping the reference count
  * while cleaning up pages that were newly allocated involves unlocking
@@ -2862,7 +2862,7 @@ int pvfs2_ioctl(
 {
     return -ENOTTY;
 }
-#endif
+#else
 
 int pvfs2_ioctl(
     struct inode *inode,
@@ -2921,6 +2921,7 @@ int pvfs2_ioctl(
 
     return ret;
 }
+#endif
 
 /** Memory map a region of a file.
  */