[Cluster-devel] cluster gfs-kernel/src/gfs/ops_file.c gfs-kern ...
fabbione at sourceware.org
fabbione at sourceware.org
Wed Jun 6 15:11:55 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-06-06 15:11:54
Modified files:
gfs-kernel/src/gfs: ops_file.c sys.c
gnbd-kernel/src: gnbd.c
Log message:
both gnbd and gfs1 need some love for .22..
gnbd:
- invalidate_bdev changed interface with commit:
f98393a64ca1392130724c3acb4e3f325801d2b6
gfs1:
- struct kset has been cleaned up with commit:
823bccfc4002296ba88c3ad0f049e1abd8108d30
- posix_test_lock changed interface with commit:
9d6a8c5c213e34c475e72b245a8eb709258e968c
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/ops_file.c.diff?cvsroot=cluster&r1=1.33&r2=1.34
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/sys.c.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/src/gnbd.c.diff?cvsroot=cluster&r1=1.18&r2=1.19
--- cluster/gfs-kernel/src/gfs/ops_file.c 2007/05/24 22:34:54 1.33
+++ cluster/gfs-kernel/src/gfs/ops_file.c 2007/06/06 15:11:54 1.34
@@ -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);
--- cluster/gfs-kernel/src/gfs/sys.c 2006/07/18 20:48:20 1.3
+++ cluster/gfs-kernel/src/gfs/sys.c 2007/06/06 15:11:54 1.4
@@ -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);
}
--- cluster/gnbd-kernel/src/gnbd.c 2007/01/05 23:01:58 1.18
+++ cluster/gnbd-kernel/src/gnbd.c 2007/06/06 15:11:54 1.19
@@ -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