[Cluster-devel] cvs head patch for 2.6.22-rc
David Teigland
teigland at redhat.com
Mon May 14 15:36:05 UTC 2007
For anyone interested in using cvs head with 2.6.22-rc kernels, here's a
patch. It'll be checked in when 2.6.22 is released.
Index: gfs-kernel/src/gfs/ops_file.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs-kernel/src/gfs/ops_file.c,v
retrieving revision 1.32
diff -u -r1.32 ops_file.c
--- gfs-kernel/src/gfs/ops_file.c 4 May 2007 14:49:35 -0000 1.32
+++ gfs-kernel/src/gfs/ops_file.c 11 May 2007 15:26:45 -0000
@@ -1573,13 +1573,7 @@
if (sdp->sd_args.ar_localflocks) {
if (IS_GETLK(cmd)) {
- int conflict;
- struct file_lock tmp;
-
- conflict = posix_test_lock(file, fl, &tmp);
- fl->fl_type = F_UNLCK;
- if (conflict)
- memcpy(fl, &tmp, sizeof(struct file_lock));
+ posix_test_lock(file, fl);
return 0;
} else {
return posix_lock_file_wait(file, fl);
Index: gfs-kernel/src/gfs/sys.c
===================================================================
RCS file: /cvs/cluster/cluster/gfs-kernel/src/gfs/sys.c,v
retrieving revision 1.3
diff -u -r1.3 sys.c
--- gfs-kernel/src/gfs/sys.c 18 Jul 2006 20:48:20 -0000 1.3
+++ gfs-kernel/src/gfs/sys.c 11 May 2007 15:26:45 -0000
@@ -86,7 +86,6 @@
};
static struct kset gfs_kset = {
- .subsys = &fs_subsys,
.kobj = {.name = "gfs",},
.ktype = &gfs_ktype,
};
@@ -121,6 +120,7 @@
{
gfs_sys_margs = NULL;
spin_lock_init(&gfs_sys_margs_lock);
+ kobj_set_kset_s(&gfs_kset, fs_subsys);
return kset_register(&gfs_kset);
}
Index: gnbd-kernel/src/gnbd.c
===================================================================
RCS file: /cvs/cluster/cluster/gnbd-kernel/src/gnbd.c,v
retrieving revision 1.18
diff -u -r1.18 gnbd.c
--- gnbd-kernel/src/gnbd.c 5 Jan 2007 23:01:58 -0000 1.18
+++ gnbd-kernel/src/gnbd.c 11 May 2007 15:26:45 -0000
@@ -714,7 +714,7 @@
if (bdev) {
blk_run_queue(dev->disk->queue);
fsync_bdev(bdev);
- invalidate_bdev(bdev, 0);
+ invalidate_bdev(bdev);
}
up(&dev->do_it_lock);
return 0;
More information about the Cluster-devel
mailing list