From 855ac971ef6f9ef888eef5eb770e5a02666d9136 Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Fri, 10 Aug 2007 14:32:32 +0200 Subject: [PATCH] --- yaml --- r: 63927 b: refs/heads/master c: f2405598e0678e9c93dd780f2a12fc562ece3d13 h: refs/heads/master i: 63925: a1bb0aab395dbe9e32c19104ee189d07c58e7276 63923: a77a147342b24743ddf9b217c0d9a4cfe76c79de 63919: a1a619784af1b3780cf99d8b19544ccab47a2fcd v: v3 --- [refs] | 2 +- trunk/drivers/s390/char/vmur.c | 4 +++- trunk/drivers/s390/char/vmur.h | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 40c49b5bda82..6a86e387a695 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 278bc68c4bfcd1af97972f5c4458acf3b9b19c37 +refs/heads/master: f2405598e0678e9c93dd780f2a12fc562ece3d13 diff --git a/trunk/drivers/s390/char/vmur.c b/trunk/drivers/s390/char/vmur.c index 27b8bf927415..04395c0f99d8 100644 --- a/trunk/drivers/s390/char/vmur.c +++ b/trunk/drivers/s390/char/vmur.c @@ -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) diff --git a/trunk/drivers/s390/char/vmur.h b/trunk/drivers/s390/char/vmur.h index 16d0a4e38e40..522a9dfaa275 100644 --- a/trunk/drivers/s390/char/vmur.h +++ b/trunk/drivers/s390/char/vmur.h @@ -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