* [Cluster-devel] cluster/gfs-kernel/src/nolock main.c
@ 2006-06-26 21:21 teigland
0 siblings, 0 replies; 2+ messages in thread
From: teigland @ 2006-06-26 21:21 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: teigland at sourceware.org 2006-06-26 21:21:46
Modified files:
gfs-kernel/src/nolock: main.c
Log message:
posix_test_lock() args updated for 2.6.17
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/nolock/main.c.diff?cvsroot=cluster&r1=1.13&r2=1.14
--- cluster/gfs-kernel/src/nolock/main.c 2006/01/09 21:27:28 1.13
+++ cluster/gfs-kernel/src/nolock/main.c 2006/06/26 21:21:46 1.14
@@ -182,13 +182,14 @@
static int nolock_plock_get(lm_lockspace_t *lockspace, struct lm_lockname *name,
struct file *file, struct file_lock *fl)
{
- 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;
^ permalink raw reply [flat|nested] 2+ messages in thread* [Cluster-devel] cluster/gfs-kernel/src/nolock main.c
@ 2006-06-26 21:27 teigland
0 siblings, 0 replies; 2+ messages in thread
From: teigland @ 2006-06-26 21:27 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: STABLE
Changes by: teigland at sourceware.org 2006-06-26 21:27:43
Modified files:
gfs-kernel/src/nolock: main.c
Log message:
posix_test_lock() args updated for 2.6.17
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/nolock/main.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.4.6.2&r2=1.4.6.2.2.1
--- cluster/gfs-kernel/src/nolock/main.c 2005/04/26 18:32:37 1.4.6.2
+++ cluster/gfs-kernel/src/nolock/main.c 2006/06/26 21:27:43 1.4.6.2.2.1
@@ -243,13 +243,14 @@
struct lm_lockname *name,
struct file *file, struct file_lock *fl)
{
- 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;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-06-26 21:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-26 21:21 [Cluster-devel] cluster/gfs-kernel/src/nolock main.c teigland
-- strict thread matches above, loose matches on Subject: below --
2006-06-26 21:27 teigland
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).