[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/GFS-kernel/FC-5 GFS-kernel.spec, 1.160, 1.161 gfs-kernel-2.6.15-2-kernel-2.6.17.patch, 1.3, 1.4



Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18533

Modified Files:
	GFS-kernel.spec gfs-kernel-2.6.15-2-kernel-2.6.17.patch 
Log Message:
Additional GFS-kernel patches for FC5.


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- GFS-kernel.spec	28 Jun 2006 22:14:57 -0000	1.160
+++ GFS-kernel.spec	30 Jun 2006 16:52:48 -0000	1.161
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.28
+Release: 5.FC5.29
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules

gfs-kernel-2.6.15-2-kernel-2.6.17.patch:
 gfs/diaper.c      |   16 ++++++++--------
 gfs/dir.c         |    1 +
 gfs/ops_address.c |   13 ++++---------
 gfs/ops_file.c    |    9 +++++----
 nolock/main.c     |   11 ++++++-----
 5 files changed, 24 insertions(+), 26 deletions(-)

Index: gfs-kernel-2.6.15-2-kernel-2.6.17.patch
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/gfs-kernel-2.6.15-2-kernel-2.6.17.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gfs-kernel-2.6.15-2-kernel-2.6.17.patch	28 Jun 2006 22:14:57 -0000	1.3
+++ gfs-kernel-2.6.15-2-kernel-2.6.17.patch	30 Jun 2006 16:52:48 -0000	1.4
@@ -1,5 +1,5 @@
 --- gfs-kernel-2.6.15-2/src/nolock/main.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
-+++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-28 17:13:23.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-30 11:49:57.000000000 -0500
 @@ -20,7 +20,7 @@
  #include <linux/smp_lock.h>
  #include <linux/lm_interface.h>
@@ -28,28 +28,65 @@
  	unlock_kernel();
  
  	return 0;
---- gfs-kernel-2.6.15-2/src/gfs/ops_address.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
-+++ gfs-kernel-2.6.15-2/src/gfs/ops_address.c	2006-06-28 17:14:31.000000000 -0500
-@@ -451,7 +451,7 @@ gfs_direct_IO(int rw, struct kiocb *iocb
- 	struct inode *inode = file->f_mapping->host;
+--- gfs-kernel-2.6.15-2/src/gfs/ops_address.c.kernel-2.6.17	2006-06-30 11:50:54.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/ops_address.c	2006-06-30 11:51:14.000000000 -0500
+@@ -104,16 +104,14 @@ get_block_noalloc(struct inode *inode, s
+ 
+ static int
+ get_blocks(struct inode *inode, sector_t lblock,
+-	   unsigned long max_blocks,
+ 	   struct buffer_head *bh_result, int create)
+ {
  	struct gfs_inode *ip = get_v2ip(inode);
- 	struct gfs_sbd *sdp = ip->i_sbd;
--	get_blocks_t *gb = get_blocks;
-+	get_block_t *gb = get_blocks;
+ 	int new = create;
+ 	uint64_t dblock;
+-	uint32_t extlen;
+ 	int error;
  
- 	atomic_inc(&sdp->sd_ops_address);
+-	error = gfs_block_map(ip, lblock, &new, &dblock, &extlen);
++	error = gfs_block_map(ip, lblock, &new, &dblock, NULL);
+ 	if (error)
+ 		return error;
+ 
+@@ -124,13 +122,10 @@ get_blocks(struct inode *inode, sector_t
+ 	if (new)
+ 		set_buffer_new(bh_result);
+ 
+-	if (extlen > max_blocks)
+-		extlen = max_blocks;
+-	bh_result->b_size = extlen << inode->i_blkbits;
+-
+ 	return 0;
+ }
  
-@@ -460,7 +460,7 @@ gfs_direct_IO(int rw, struct kiocb *iocb
- 		return -EINVAL;
++#if 0
+ /**
+  * get_blocks_noalloc - 
+  * @inode:
+@@ -144,12 +139,11 @@ get_blocks(struct inode *inode, sector_t
+ 
+ static int
+ get_blocks_noalloc(struct inode *inode, sector_t lblock,
+-		   unsigned long max_blocks,
+ 		   struct buffer_head *bh_result, int create)
+ {
+ 	int error;
  
- 	if (rw == WRITE && !get_transaction)
--		gb = get_blocks_noalloc;
-+		gb = get_block_noalloc;
+-	error = get_blocks(inode, lblock, max_blocks, bh_result, FALSE);
++	error = get_blocks(inode, lblock, bh_result, FALSE);
+ 	if (error)
+ 		return error;
  
- 	return blockdev_direct_IO(rw, iocb, inode,
- 				  inode->i_sb->s_bdev, iov,
+@@ -159,6 +153,7 @@ get_blocks_noalloc(struct inode *inode, 
+ 
+ 	return 0;
+ }
++#endif
+ 
+ /**
+  * gfs_writepage - Write complete page
 --- gfs-kernel-2.6.15-2/src/gfs/diaper.c.kernel-2.6.17	2006-02-13 16:15:32.000000000 -0600
-+++ gfs-kernel-2.6.15-2/src/gfs/diaper.c	2006-06-28 17:13:23.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/diaper.c	2006-06-30 11:49:57.000000000 -0500
 @@ -232,9 +232,9 @@ get_dummy_sb(struct diaper_holder *dh)
  	struct inode *inode;
  	int error;
@@ -114,3 +151,33 @@
  
  	bdput(diaper);
  	del_gendisk(gd);
+--- gfs-kernel-2.6.15-2/src/gfs/dir.c.kernel-2.6.17	2006-06-30 11:50:15.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/dir.c	2006-06-30 11:50:27.000000000 -0500
+@@ -59,6 +59,7 @@
+ 
+ #include <linux/sched.h>
+ #include <linux/slab.h>
++#include <linux/vmalloc.h>
+ #include <linux/smp_lock.h>
+ #include <linux/spinlock.h>
+ #include <asm/semaphore.h>
+--- gfs-kernel-2.6.15-2/src/gfs/ops_file.c.kernel-2.6.17	2006-06-30 11:51:38.000000000 -0500
++++ gfs-kernel-2.6.15-2/src/gfs/ops_file.c	2006-06-30 11:51:44.000000000 -0500
+@@ -1465,12 +1465,13 @@ gfs_lock(struct file *file, int cmd, str
+ 
+ 	if (sdp->sd_args.ar_localflocks) {
+ 		if (IS_GETLK(cmd)) {
+-			struct file_lock *tmp;
++			struct file_lock tmp;
++			int ret;
+ 			lock_kernel();
+-			tmp = posix_test_lock(file, fl);
++			ret = posix_test_lock(file, fl, &tmp);
+ 			fl->fl_type = F_UNLCK;
+-			if (tmp)
+-				memcpy(fl, tmp, sizeof(struct file_lock));
++			if (ret)
++				memcpy(fl, &tmp, sizeof(struct file_lock));
+ 			unlock_kernel();
+ 		        return 0;
+ 		} else {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]