[Pvfs2-cvs] commit by pcarns in pvfs2-1/src/kernel/linux-2.6: inode.c pvfs2-mod.c super.c

[CVS commit program]

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

Modified Files:
      Tag: pvfs-2-8-branch
	inode.c pvfs2-mod.c super.c 
Log Message:
merge 2.6.32 kernel updates from trunk to pvfs-2-8-branch


Index: inode.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/inode.c,v
diff -p -u -r1.86.2.2 -r1.86.2.3
--- inode.c	1 Oct 2009 15:55:57 -0000	1.86.2.2
+++ inode.c	27 Jan 2010 20:49:06 -0000	1.86.2.3
@@ -133,6 +133,9 @@ static int pvfs2_releasepage(struct page
 
 struct backing_dev_info pvfs2_backing_dev_info =
 {
+#ifdef HAVE_BACKING_DEV_INFO_NAME
+    .name = "pvfs2",
+#endif
     .ra_pages = 0,
 #ifdef HAVE_BDI_MEMORY_BACKED
     /* old interface, up through 2.6.11 */

Index: pvfs2-mod.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/pvfs2-mod.c,v
diff -p -u -r1.38 -r1.38.12.1
--- pvfs2-mod.c	20 Mar 2008 03:21:26 -0000	1.38
+++ pvfs2-mod.c	27 Jan 2010 20:49:06 -0000	1.38.12.1
@@ -100,6 +100,12 @@ static int __init pvfs2_init(void)
     int ret = -1;
     gossip_debug(GOSSIP_INIT_DEBUG, "pvfs2: pvfs2_init called with debug mask 0x%x\n", gossip_debug_mask);
 
+#ifdef HAVE_BDI_INIT
+    ret = bdi_init(&pvfs2_backing_dev_info);
+    if(ret)
+        return(ret);
+#endif
+
     if(op_timeout_secs < 0)
     {
         op_timeout_secs = 0;
@@ -170,6 +176,9 @@ cleanup_req:
 cleanup_op:
     op_cache_finalize();
 err:
+#ifdef HAVE_BDI_INIT
+    bdi_destroy(&pvfs2_backing_dev_info);
+#endif
     return ret;
 }
 
@@ -218,6 +227,10 @@ static void __exit pvfs2_exit(void)
 
     qhash_finalize(htable_ops_in_progress);
     
+#ifdef HAVE_BDI_INIT
+    bdi_destroy(&pvfs2_backing_dev_info);
+#endif
+
     printk("pvfs2: module version %s unloaded\n", PVFS2_VERSION);
 }
 

Index: super.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/super.c,v
diff -p -u -r1.106.2.6 -r1.106.2.7
--- super.c	6 Jan 2010 05:22:52 -0000	1.106.2.6
+++ super.c	27 Jan 2010 20:49:06 -0000	1.106.2.7
@@ -1450,20 +1450,14 @@ static void pvfs2_flush_sb(
 {
 #ifdef HAVE_SB_DIRTY_LIST
     if (!list_empty(&sb->s_dirty))
-#else
-    if (!list_empty(&sb->s_bdi->wb.b_dirty))
-#endif
     {
         struct inode *inode = NULL;
-#ifdef HAVE_SB_DIRTY_LIST
         list_for_each_entry (inode, &sb->s_dirty, i_list)
-#else
-        list_for_each_entry (inode, &sb->s_bdi->wb.b_dirty, i_list)
-#endif
         {
             pvfs2_flush_inode(inode);
         }
     }
+#endif
     return;
 }