Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 63927
b: refs/heads/master
c: f240559
h: refs/heads/master
i:
  63925: a1bb0aa
  63923: a77a147
  63919: a1a6197
v: v3
  • Loading branch information
Michael Holzheu authored and Martin Schwidefsky committed Aug 10, 2007
1 parent 5633d76 commit 855ac97
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 278bc68c4bfcd1af97972f5c4458acf3b9b19c37
refs/heads/master: f2405598e0678e9c93dd780f2a12fc562ece3d13
4 changes: 3 additions & 1 deletion trunk/drivers/s390/char/vmur.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,9 @@ static int verify_device(struct urdev *urd)
rc = diag_read_next_file_info(&fcb, 0);
if (rc)
return rc;

/* if file is in hold status, we do not read it */
if (fcb.file_stat & (FLG_SYSTEM_HOLD | FLG_USER_HOLD))
return -EPERM;
/* open file on virtual reader */
buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (!buf)
Expand Down
4 changes: 3 additions & 1 deletion trunk/drivers/s390/char/vmur.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ struct file_control_block {
char rest[200];
} __attribute__ ((packed));

#define FLG_CP_DUMP 0x10
#define FLG_SYSTEM_HOLD 0x04
#define FLG_CP_DUMP 0x10
#define FLG_USER_HOLD 0x20

/*
* A struct urdev is created for each ur device that is made available
Expand Down

0 comments on commit 855ac97

Please sign in to comment.