* [Cluster-devel] cluster/gfs-kernel/src/dlm plock.c
@ 2006-09-14 16:00 adas
0 siblings, 0 replies; 6+ messages in thread
From: adas @ 2006-09-14 16:00 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4U4
Changes by: adas at sourceware.org 2006-09-14 16:00:28
Modified files:
gfs-kernel/src/dlm: plock.c
Log message:
fix for bz 206339. Was passing fl_pid instead of fl_owner causing F_GETLK to return conflicts with a process' own locks
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/plock.c.diff?cvsroot=cluster&only_with_tag=RHEL4U4&r1=1.12.14.1&r2=1.12.14.2
--- cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/07/12 21:50:26 1.12.14.1
+++ cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/09/14 16:00:27 1.12.14.2
@@ -753,7 +753,7 @@
shrink, shift, split, etc existing locks (this often involves adding new
locks in addition to modifying existing locks. */
-static int plock_internal(struct dlm_resource *r, unsigned long owner,
+static int plock_internal(struct dlm_resource *r, unsigned long owner,
unsigned int pid, int wait, int ex, uint64_t start,
uint64_t end)
{
@@ -1179,7 +1179,7 @@
put_resource(r);
goto out;
}
-
+
found = get_local_conflict(dlm, r, name, owner, start, end, ex,
rowner, rpid);
up(&r->sema);
@@ -1187,7 +1187,7 @@
if (found) {
error = 1;
goto out;
- }
+ }
}
error = get_global_conflict(dlm, name, owner, start, end, ex, rowner, rpid);
@@ -1236,7 +1236,7 @@
ex = (fl->fl_type == F_WRLCK) ? 1 : 0;
- error = do_plock_get(dlm, name, fl->fl_pid, &fl->fl_start,
+ error = do_plock_get(dlm, name, fl->fl_owner, &fl->fl_start,
&fl->fl_end, &ex, &owner, &pid);
if (error < 0)
return error;
^ permalink raw reply [flat|nested] 6+ messages in thread* [Cluster-devel] cluster/gfs-kernel/src/dlm plock.c
@ 2006-09-15 17:43 adas
0 siblings, 0 replies; 6+ messages in thread
From: adas @ 2006-09-15 17:43 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: STABLE
Changes by: adas at sourceware.org 2006-09-15 17:43:41
Modified files:
gfs-kernel/src/dlm: plock.c
Log message:
fix for bz 206590. F_UNLCK was returning -ENOENT when it didn't find plocks associated with the given inode. Should return 0 now.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/plock.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.12.8.2&r2=1.12.8.3
--- cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/09/14 16:00:18 1.12.8.2
+++ cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/09/15 17:43:41 1.12.8.3
@@ -1012,8 +1012,11 @@
log_debug("en punlock %x,%"PRIx64"", name->ln_type, name->ln_number);
error = get_resource(dlm, name, NO_CREATE, &r);
- if (error)
+ if (error) {
+ if (error == -ENOENT)
+ error = 0;
goto out;
+ }
down(&r->sema);
^ permalink raw reply [flat|nested] 6+ messages in thread* [Cluster-devel] cluster/gfs-kernel/src/dlm plock.c
@ 2006-09-15 17:43 adas
0 siblings, 0 replies; 6+ messages in thread
From: adas @ 2006-09-15 17:43 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4U4
Changes by: adas at sourceware.org 2006-09-15 17:43:14
Modified files:
gfs-kernel/src/dlm: plock.c
Log message:
fix for bz 206590. F_UNLCK was returning -ENOENT when it didn't find plocks associated with the given inode. Should return 0 now.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/plock.c.diff?cvsroot=cluster&only_with_tag=RHEL4U4&r1=1.12.14.2&r2=1.12.14.3
--- cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/09/14 16:00:27 1.12.14.2
+++ cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/09/15 17:43:14 1.12.14.3
@@ -1012,8 +1012,11 @@
log_debug("en punlock %x,%"PRIx64"", name->ln_type, name->ln_number);
error = get_resource(dlm, name, NO_CREATE, &r);
- if (error)
+ if (error) {
+ if (error == -ENOENT)
+ error = 0;
goto out;
+ }
down(&r->sema);
^ permalink raw reply [flat|nested] 6+ messages in thread* [Cluster-devel] cluster/gfs-kernel/src/dlm plock.c
@ 2006-09-15 17:42 adas
0 siblings, 0 replies; 6+ messages in thread
From: adas @ 2006-09-15 17:42 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4
Changes by: adas at sourceware.org 2006-09-15 17:42:49
Modified files:
gfs-kernel/src/dlm: plock.c
Log message:
fix for bz 206590. F_UNLCK was returning -ENOENT when it didn't find plocks associated with the given inode. Should return 0 now.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/plock.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.12.2.2&r2=1.12.2.3
--- cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/09/14 16:00:48 1.12.2.2
+++ cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/09/15 17:42:49 1.12.2.3
@@ -1012,8 +1012,11 @@
log_debug("en punlock %x,%"PRIx64"", name->ln_type, name->ln_number);
error = get_resource(dlm, name, NO_CREATE, &r);
- if (error)
+ if (error) {
+ if (error == -ENOENT)
+ error = 0;
goto out;
+ }
down(&r->sema);
^ permalink raw reply [flat|nested] 6+ messages in thread* [Cluster-devel] cluster/gfs-kernel/src/dlm plock.c
@ 2006-09-14 16:00 adas
0 siblings, 0 replies; 6+ messages in thread
From: adas @ 2006-09-14 16:00 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4
Changes by: adas at sourceware.org 2006-09-14 16:00:49
Modified files:
gfs-kernel/src/dlm: plock.c
Log message:
fix for bz 206339. Was passing fl_pid instead of fl_owner causing F_GETLK to return conflicts with a process' own locks
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/plock.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.12.2.1&r2=1.12.2.2
--- cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/07/12 21:53:30 1.12.2.1
+++ cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/09/14 16:00:48 1.12.2.2
@@ -1236,7 +1236,7 @@
ex = (fl->fl_type == F_WRLCK) ? 1 : 0;
- error = do_plock_get(dlm, name, fl->fl_pid, &fl->fl_start,
+ error = do_plock_get(dlm, name, fl->fl_owner, &fl->fl_start,
&fl->fl_end, &ex, &owner, &pid);
if (error < 0)
return error;
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Cluster-devel] cluster/gfs-kernel/src/dlm plock.c
@ 2006-09-14 16:00 adas
0 siblings, 0 replies; 6+ messages in thread
From: adas @ 2006-09-14 16:00 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: STABLE
Changes by: adas at sourceware.org 2006-09-14 16:00:18
Modified files:
gfs-kernel/src/dlm: plock.c
Log message:
fix for bz 206339. Was passing fl_pid instead of fl_owner causing F_GETLK to return conflicts with a process' own locks
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/plock.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.12.8.1&r2=1.12.8.2
--- cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/07/12 21:58:29 1.12.8.1
+++ cluster/gfs-kernel/src/dlm/Attic/plock.c 2006/09/14 16:00:18 1.12.8.2
@@ -753,7 +753,7 @@
shrink, shift, split, etc existing locks (this often involves adding new
locks in addition to modifying existing locks. */
-static int plock_internal(struct dlm_resource *r, unsigned long owner,
+static int plock_internal(struct dlm_resource *r, unsigned long owner,
unsigned int pid, int wait, int ex, uint64_t start,
uint64_t end)
{
@@ -1179,7 +1179,7 @@
put_resource(r);
goto out;
}
-
+
found = get_local_conflict(dlm, r, name, owner, start, end, ex,
rowner, rpid);
up(&r->sema);
@@ -1187,7 +1187,7 @@
if (found) {
error = 1;
goto out;
- }
+ }
}
error = get_global_conflict(dlm, name, owner, start, end, ex, rowner, rpid);
@@ -1236,7 +1236,7 @@
ex = (fl->fl_type == F_WRLCK) ? 1 : 0;
- error = do_plock_get(dlm, name, fl->fl_pid, &fl->fl_start,
+ error = do_plock_get(dlm, name, fl->fl_owner, &fl->fl_start,
&fl->fl_end, &ex, &owner, &pid);
if (error < 0)
return error;
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2006-09-15 17:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-14 16:00 [Cluster-devel] cluster/gfs-kernel/src/dlm plock.c adas
-- strict thread matches above, loose matches on Subject: below --
2006-09-15 17:43 adas
2006-09-15 17:43 adas
2006-09-15 17:42 adas
2006-09-14 16:00 adas
2006-09-14 16:00 adas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).