Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 38667
b: refs/heads/master
c: 3a2a9c9
h: refs/heads/master
i:
  38665: 77d49ea
  38663: 2c78094
v: v3
  • Loading branch information
David Teigland authored and Steven Whitehouse committed Apr 25, 2006
1 parent a6ab397 commit eb08465
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 373b5a453255b6a013b9d20116918f09a1ceeccc
refs/heads/master: 3a2a9c96ac129d17aad1a5c46988ad28f72564b0
6 changes: 3 additions & 3 deletions trunk/fs/gfs2/locking/dlm/plock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ int gdlm_plock(lm_lockspace_t *lockspace, struct lm_lockname *name,
return -ENOMEM;

op->info.optype = GDLM_PLOCK_OP_LOCK;
op->info.pid = (uint32_t) fl->fl_owner;
op->info.pid = fl->fl_pid;
op->info.ex = (fl->fl_type == F_WRLCK);
op->info.wait = IS_SETLKW(cmd);
op->info.fsid = ls->id;
Expand Down Expand Up @@ -116,7 +116,7 @@ int gdlm_punlock(lm_lockspace_t *lockspace, struct lm_lockname *name,
name->ln_type, name->ln_number);

op->info.optype = GDLM_PLOCK_OP_UNLOCK;
op->info.pid = (uint32_t) fl->fl_owner;
op->info.pid = fl->fl_pid;
op->info.fsid = ls->id;
op->info.number = name->ln_number;
op->info.start = fl->fl_start;
Expand Down Expand Up @@ -150,7 +150,7 @@ int gdlm_plock_get(lm_lockspace_t *lockspace, struct lm_lockname *name,
return -ENOMEM;

op->info.optype = GDLM_PLOCK_OP_GET;
op->info.pid = (uint32_t) fl->fl_owner;
op->info.pid = fl->fl_pid;
op->info.ex = (fl->fl_type == F_WRLCK);
op->info.fsid = ls->id;
op->info.number = name->ln_number;
Expand Down

0 comments on commit eb08465

Please sign in to comment.