Cluster Project branch, STABLE2, updated. cluster-2.03.05-5-ga63d861

[fabbione at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=a63d861990a7c8cf5dcbc50a0b1f86c7156edfaf

The branch, STABLE2 has been updated
       via  a63d861990a7c8cf5dcbc50a0b1f86c7156edfaf (commit)
       via  fb70fa32ad48235a93dee140d764658856904be6 (commit)
       via  82d176ba485f2ef049fd303b9e41868667cebbdb (commit)
       via  95a0ca2bd81ead2036ed609d71cb4c3e1e21960a (commit)
       via  303b48f80ea023a58b32bc2b4b017d3fdd9f59da (commit)
      from  78a78bc47644465fbc9cf7acb5d781daf7cb4e5b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a63d861990a7c8cf5dcbc50a0b1f86c7156edfaf
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Tue Jul 1 09:59:00 2008 +0200

    [BUILD] Add install/uninstall snippets for documents
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

commit fb70fa32ad48235a93dee140d764658856904be6
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Mon May 19 05:57:01 2008 +0200

    [GFS] Fix comment
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

commit 82d176ba485f2ef049fd303b9e41868667cebbdb
Author: Bob Peterson <rpeterso@redhat.com>
Date:   Sun May 18 22:47:35 2008 -0500

    Replace put_inode with drop_inode

commit 95a0ca2bd81ead2036ed609d71cb4c3e1e21960a
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Tue May 13 10:51:11 2008 +0200

    [GFS] Make gfs build with 2.6.26 (DO NOT USE!)
    
    put_inode has been removed from the main kernel. gfs1 needs
    a full porting and review. This commit allows only to build
    the module but it will NOT work.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

commit 303b48f80ea023a58b32bc2b4b017d3fdd9f59da
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Tue May 13 10:27:40 2008 +0200

    [GNBD] Update gnbd to work with 2.6.26
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 gfs-kernel/src/gfs/ops_address.c |    2 +-
 gfs-kernel/src/gfs/ops_super.c   |    7 ++-
 gfs-kernel/src/gfs/quota.c       |    4 +-
 gnbd-kernel/src/gnbd.c           |   91 +++++++++++++++++++-------------------
 gnbd-kernel/src/gnbd.h           |    4 +-
 make/install.mk                  |    4 ++
 make/uninstall.mk                |    3 +
 7 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/gfs-kernel/src/gfs/ops_address.c b/gfs-kernel/src/gfs/ops_address.c
index 842b0cb..63854ef 100644
--- a/gfs-kernel/src/gfs/ops_address.c
+++ b/gfs-kernel/src/gfs/ops_address.c
@@ -404,7 +404,7 @@ gfs_commit_write(struct file *file, struct page *page,
 		if (inode->i_size < file_size)
 			i_size_write(inode, file_size);
 	} else {
-		error = generic_commit_write(file, page, from, to);
+		error = block_commit_write(page, from, to);
 		if (error)
 			goto fail;
 	}
diff --git a/gfs-kernel/src/gfs/ops_super.c b/gfs-kernel/src/gfs/ops_super.c
index d4ca744..0d60d18 100644
--- a/gfs-kernel/src/gfs/ops_super.c
+++ b/gfs-kernel/src/gfs/ops_super.c
@@ -49,7 +49,7 @@ gfs_write_inode(struct inode *inode, int sync)
 }
 
 /**
- * gfs_put_inode - put an inode
+ * gfs_drop_inode - drop an inode
  * @inode: The inode
  *
  * If i_nlink is zero, any dirty data for the inode is thrown away.
@@ -58,7 +58,7 @@ gfs_write_inode(struct inode *inode, int sync)
  */
 
 static void
-gfs_put_inode(struct inode *inode)
+gfs_drop_inode(struct inode *inode)
 {
 	struct gfs_sbd *sdp = get_v2sdp(inode->i_sb);
 	struct gfs_inode *ip = get_v2ip(inode);
@@ -70,6 +70,7 @@ gfs_put_inode(struct inode *inode)
 	    S_ISREG(inode->i_mode) &&
 	    !sdp->sd_args.ar_localcaching)
 		gfs_sync_page_i(inode, DIO_START | DIO_WAIT);
+	generic_drop_inode(inode);
 }
 
 /**
@@ -442,7 +443,7 @@ gfs_show_options(struct seq_file *s, struct vfsmount *mnt)
 
 struct super_operations gfs_super_ops = {
 	.write_inode = gfs_write_inode,
-	.put_inode = gfs_put_inode,
+	.drop_inode = gfs_drop_inode,
 	.put_super = gfs_put_super,
 	.write_super = gfs_write_super,
 	.write_super_lockfs = gfs_write_super_lockfs,
diff --git a/gfs-kernel/src/gfs/quota.c b/gfs-kernel/src/gfs/quota.c
index f98558b..13093a6 100644
--- a/gfs-kernel/src/gfs/quota.c
+++ b/gfs-kernel/src/gfs/quota.c
@@ -947,8 +947,8 @@ print_quota_message(struct gfs_sbd *sdp, struct gfs_quota_data *qd, char *type)
 
 	if (current->signal) {
 		tty = current->signal->tty;
-		if (tty && tty->driver->write)
-			tty->driver->write(tty, line, len);
+		if (tty && tty->ops->write)
+			tty->ops->write(tty, line, len);
 	}
 
 	kfree(line);
diff --git a/gnbd-kernel/src/gnbd.c b/gnbd-kernel/src/gnbd.c
index 2fb4c20..a8cfe4d 100644
--- a/gnbd-kernel/src/gnbd.c
+++ b/gnbd-kernel/src/gnbd.c
@@ -56,26 +56,25 @@ static spinlock_t gnbd_lock = SPIN_LOCK_UNLOCKED;
 
 #define to_gnbd_dev(d) container_of(d, struct gnbd_device, class_dev)
 
-static void gnbd_class_release(struct class_device *class_dev)
+static void gnbd_class_release(struct device *class_dev)
 {
 	/* FIXME -- What the hell do I have to free up here */
 }
 
 static struct class gnbd_class = {
 	.name = "gnbd",
-	.release = gnbd_class_release
+	.dev_release = gnbd_class_release
 };
 
-
-static ssize_t show_pid(struct class_device *class_dev, char *buf)
+static ssize_t show_pid(struct device *class_dev, struct device_attribute *attr, char *buf)
 {
 	struct gnbd_device *dev = to_gnbd_dev(class_dev);
 	return sprintf(buf, "%d\n", dev->receiver_pid);
 }
 
-static CLASS_DEVICE_ATTR(pid, S_IRUGO, show_pid, NULL);
+DEVICE_ATTR(pid, S_IRUGO, show_pid, NULL);
 
-static ssize_t show_server(struct class_device *class_dev, char *buf)
+static ssize_t show_server(struct device *class_dev, struct device_attribute *attr, char *buf)
 {
 	struct gnbd_device *dev = to_gnbd_dev(class_dev);
 	if (dev->server_name)
@@ -86,7 +85,7 @@ static ssize_t show_server(struct class_device *class_dev, char *buf)
 }
 
 /* FIXME -- should a empty store free the memory */
-static ssize_t store_server(struct class_device *class_dev,
+static ssize_t store_server(struct device *class_dev, struct device_attribute *attr,
 		const char *buf, size_t count)
 {
 	int res;
@@ -116,15 +115,15 @@ static ssize_t store_server(struct class_device *class_dev,
 	return count;
 }
 
-CLASS_DEVICE_ATTR(server, S_IRUGO | S_IWUSR, show_server, store_server);
+DEVICE_ATTR(server, S_IRUGO | S_IWUSR, show_server, store_server);
 
-static ssize_t show_name(struct class_device *class_dev, char *buf)
+static ssize_t show_name(struct device *class_dev, struct device_attribute *attr, char *buf)
 {
 	struct gnbd_device *dev = to_gnbd_dev(class_dev);
 	return sprintf(buf, "%s\n", dev->name);
 }
 
-static ssize_t store_name(struct class_device *class_dev,
+static ssize_t store_name(struct device *class_dev, struct device_attribute *attr,
                 const char *buf, size_t count)
 {
 	int res;
@@ -138,17 +137,17 @@ static ssize_t store_name(struct class_device *class_dev,
 	return count;
 }
 
-CLASS_DEVICE_ATTR(name, S_IRUGO | S_IWUSR, show_name, store_name);
+DEVICE_ATTR(name, S_IRUGO | S_IWUSR, show_name, store_name);
 
 
-static ssize_t show_sectors(struct class_device *class_dev, char *buf)
+static ssize_t show_sectors(struct device *class_dev, struct device_attribute *attr, char *buf)
 {
 	struct gnbd_device *dev = to_gnbd_dev(class_dev);
 	return sprintf(buf, "%Lu\n",
 			(unsigned long long)get_capacity(dev->disk));
 }
 
-static ssize_t store_sectors(struct class_device *class_dev,
+static ssize_t store_sectors(struct device *class_dev, struct device_attribute *attr,
 		const char *buf, size_t count)
 {
 	int res;
@@ -177,23 +176,23 @@ static ssize_t store_sectors(struct class_device *class_dev,
 	return count;
 }
 
-CLASS_DEVICE_ATTR(sectors, S_IRUGO | S_IWUSR, show_sectors, store_sectors);
+DEVICE_ATTR(sectors, S_IRUGO | S_IWUSR, show_sectors, store_sectors);
 
-static ssize_t show_usage(struct class_device *class_dev, char *buf)
+static ssize_t show_usage(struct device *class_dev, struct device_attribute *attr, char *buf)
 {
 	struct gnbd_device *dev = to_gnbd_dev(class_dev);
 	return sprintf(buf, "%d\n", dev->open_count);
 }
 
-CLASS_DEVICE_ATTR(usage, S_IRUGO, show_usage, NULL);
+DEVICE_ATTR(usage, S_IRUGO, show_usage, NULL);
 
-static ssize_t show_flags(struct class_device *class_dev, char *buf)
+static ssize_t show_flags(struct device *class_dev, struct device_attribute *attr, char *buf)
 {
 	struct gnbd_device *dev = to_gnbd_dev(class_dev);
 	return sprintf(buf, "0x%04x\n", dev->flags);
 }
 
-static ssize_t store_flags(struct class_device *class_dev,
+static ssize_t store_flags(struct device *class_dev, struct device_attribute *attr,
                 const char *buf, size_t count)
 {
 	int res;
@@ -209,9 +208,9 @@ static ssize_t store_flags(struct class_device *class_dev,
 }
 
 
-CLASS_DEVICE_ATTR(flags, S_IRUGO | S_IWUSR, show_flags, store_flags);
+DEVICE_ATTR(flags, S_IRUGO | S_IWUSR, show_flags, store_flags);
 
-static ssize_t show_waittime(struct class_device *class_dev, char *buf)
+static ssize_t show_waittime(struct device *class_dev, struct device_attribute *attr, char *buf)
 {
 	struct gnbd_device *dev = to_gnbd_dev(class_dev);
 	if (list_empty(&dev->queue_head))
@@ -220,15 +219,15 @@ static ssize_t show_waittime(struct class_device *class_dev, char *buf)
 			((long)jiffies - (long)dev->last_received) / HZ);
 }
 
-CLASS_DEVICE_ATTR(waittime, S_IRUGO, show_waittime, NULL);
+DEVICE_ATTR(waittime, S_IRUGO, show_waittime, NULL);
 
-static ssize_t show_connected(struct class_device *class_dev, char *buf)
+static ssize_t show_connected(struct device *class_dev, struct device_attribute *attr, char *buf)
 {
 	struct gnbd_device *dev = to_gnbd_dev(class_dev);
 	return sprintf(buf, "%d\n", (dev->sock != NULL));
 }
 
-CLASS_DEVICE_ATTR(connected, S_IRUGO, show_connected, NULL);
+DEVICE_ATTR(connected, S_IRUGO, show_connected, NULL);
 
 #ifndef NDEBUG
 static const char *ioctl_cmd_to_ascii(int cmd)
@@ -958,7 +957,7 @@ static int __init gnbd_init(void)
 	gnbd_cmd(&ping_req) = GNBD_CMD_PING;
 	ping_req.sector = 0;
 	ping_req.nr_sectors = 0;
-	
+
 	for (i = 0; i < MAX_GNBD; i++) {
 		struct gendisk *disk = alloc_disk(1);
 		if (!disk)
@@ -1014,35 +1013,35 @@ static int __init gnbd_init(void)
 		init_waitqueue_head(&gnbd_dev[i].tx_wait);
 		gnbd_dev[i].current_request = NULL;
 		gnbd_dev[i].class_dev.class = &gnbd_class;
-		sprintf(gnbd_dev[i].class_dev.class_id, "gnbd%d", i);
-		err = class_device_register(&gnbd_dev[i].class_dev);
+		sprintf(gnbd_dev[i].class_dev.bus_id, "gnbd%d", i);
+		err = device_register(&gnbd_dev[i].class_dev);
 		if (err){
-			printk("class_device_register failed with %d\n", err);
+			printk("device_register failed with %d\n", err);
 			goto out_unregister_class;
 		}
-		if(class_device_create_file(&gnbd_dev[i].class_dev,
-					&class_device_attr_pid))
+		if(device_create_file(&gnbd_dev[i].class_dev,
+					&dev_attr_pid))
 			goto out_remove_file;
-		if(class_device_create_file(&gnbd_dev[i].class_dev,
-					&class_device_attr_server))
+		if(device_create_file(&gnbd_dev[i].class_dev,
+					&dev_attr_server))
 			goto out_remove_file;
-		if(class_device_create_file(&gnbd_dev[i].class_dev,
-					&class_device_attr_name))
+		if(device_create_file(&gnbd_dev[i].class_dev,
+					&dev_attr_name))
 			goto out_remove_file;
-		if(class_device_create_file(&gnbd_dev[i].class_dev,
-					&class_device_attr_sectors))
+		if(device_create_file(&gnbd_dev[i].class_dev,
+					&dev_attr_sectors))
 			goto out_remove_file;
-		if(class_device_create_file(&gnbd_dev[i].class_dev,
-					&class_device_attr_usage))
+		if(device_create_file(&gnbd_dev[i].class_dev,
+					&dev_attr_usage))
 			goto out_remove_file;
-		if(class_device_create_file(&gnbd_dev[i].class_dev,
-					&class_device_attr_flags))
+		if(device_create_file(&gnbd_dev[i].class_dev,
+					&dev_attr_flags))
 			goto out_remove_file;
-		if(class_device_create_file(&gnbd_dev[i].class_dev,
-					&class_device_attr_waittime))
+		if(device_create_file(&gnbd_dev[i].class_dev,
+					&dev_attr_waittime))
 			goto out_remove_file;
-		if(class_device_create_file(&gnbd_dev[i].class_dev,
-					&class_device_attr_connected))
+		if(device_create_file(&gnbd_dev[i].class_dev,
+					&dev_attr_connected))
 			goto out_remove_file;
 		disk->major = major_nr;
 		disk->first_minor = i;
@@ -1068,11 +1067,11 @@ static int __init gnbd_init(void)
 out_remove_disk:
 	del_gendisk(gnbd_dev[i].disk);
 out_remove_file:
-	class_device_unregister(&gnbd_dev[i].class_dev);
+	device_unregister(&gnbd_dev[i].class_dev);
 out_unregister_class:
 	while(i--){
 		del_gendisk(gnbd_dev[i].disk);
-		class_device_unregister(&gnbd_dev[i].class_dev);
+		device_unregister(&gnbd_dev[i].class_dev);
 	}
 	i = MAX_GNBD;
 	class_unregister(&gnbd_class);
@@ -1093,7 +1092,7 @@ static void __exit gnbd_cleanup(void)
 	gnbd_ctl_cleanup();
 	for (i = 0; i < MAX_GNBD; i++) {
 		struct gendisk *disk = gnbd_dev[i].disk;
-		class_device_unregister(&gnbd_dev[i].class_dev);
+		device_unregister(&gnbd_dev[i].class_dev);
 		if (disk) {
 			del_gendisk(disk);
 			blk_cleanup_queue(disk->queue);
diff --git a/gnbd-kernel/src/gnbd.h b/gnbd-kernel/src/gnbd.h
index 8456d25..b0b45dc 100644
--- a/gnbd-kernel/src/gnbd.h
+++ b/gnbd-kernel/src/gnbd.h
@@ -15,7 +15,7 @@ enum {
 	GNBD_CMD_PING = 3
 };
 
-#define gnbd_cmd(req) ((req)->cmd[0])
+#define gnbd_cmd(req) ((req)->__cmd[0])
 #define MAX_GNBD 128
 
 /* values for flags field */
@@ -37,7 +37,7 @@ struct gnbd_device {
 	pid_t receiver_pid;
 	struct semaphore do_it_lock;
 	int open_count;
-	struct class_device class_dev;
+	struct device class_dev;
 	unsigned short int server_port;
 	char *server_name;
 	char name[32];
diff --git a/make/install.mk b/make/install.mk
index 3331a1f..7d99029 100644
--- a/make/install.mk
+++ b/make/install.mk
@@ -55,3 +55,7 @@ ifdef FENCEAGENTSLIB
 	install -d ${DESTDIR}/${fenceagentslibdir}
 	install -m644 $(S)/${FENCEAGENTSLIB} ${DESTDIR}/${fenceagentslibdir}
 endif
+ifdef DOCS
+	install -d ${docdir}
+	install -m644 $(S)/${DOCS} ${docdir}
+endif
diff --git a/make/uninstall.mk b/make/uninstall.mk
index 9e64522..b54ac85 100644
--- a/make/uninstall.mk
+++ b/make/uninstall.mk
@@ -35,3 +35,6 @@ endif
 ifdef FENCEAGENTSLIB
 	${UNINSTALL} ${FENCEAGENTSLIB}* ${DESTDIR}/${fenceagentslibdir}
 endif
+ifdef DOCS
+	${UNINSTALL} ${DOCS} ${docdir}
+endif


hooks/post-receive
--
Cluster Project