Please pull git390 'for-linus' branch
Subsystems (2)
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
arch/s390/Kconfig | 4 - arch/s390/hypfs/inode.c | 12 +++ drivers/s390/char/monwriter.c | 6 ++ drivers/s390/char/vmur.c | 176 +++++++++++++++++++++++++---------------- drivers/s390/char/vmur.h | 5 +- drivers/s390/cio/css.c | 1 + drivers/s390/cio/qdio.c | 92 +++++++++++----------- 7 files changed, 178 insertions(+), 118 deletions(-)
Cornelia Huck (1):
[S390] cio: avoid memory leak on error in css_alloc_subchannel().
Heiko Carstens (3):
[S390] qdio: make sure data structures are correctly aligned. [S390] remove DEFAULT_MIGRATION_COST
[S390] vmur: use DECLARE_COMPLETION_ONSTACK to keep lockdep happy
Melissa Howland (1):
[S390] monwriter: Serialization bug for multithreaded applications.
Michael Holzheu (5):
[S390] hypfs: implement show_options
[S390] vmur: allocate single record buffers instead of one big data buffer [S390] vmur: reject open on z/VM reader files with status HOLD [S390] vmur: add "top of queue" sanity check for reader open [S390] vmur: diag14 only works with buffers below 2GB
arch/s390/Kconfig +0 -4
@@ -109,10 +109,6 @@ config HOTPLUG_CPU can be controlled through /sys/devices/system/cpu/cpu#. Say N if you want to disable CPU hotplug. -config DEFAULT_MIGRATION_COST - int - default "1000000" - config MATHEMU bool "IEEE FPU emulation" depends on MARCH_G5
arch/s390/hypfs/inode.c +12 -0
@@ -17,6 +17,8 @@#include <linux/parser.h> #include <linux/sysfs.h> #include <linux/module.h> +#include <linux/seq_file.h> +#include <linux/mount.h> #include <asm/ebcdic.h> #include "hypfs.h"
@@ -256,6 +258,15 @@ static int hypfs_parse_options(char *options, struct super_block *sb)return 0 ; } +static int hypfs_show_options (struct seq_file *s,struct vfsmount *mnt) +{ +struct hypfs_sb_info *hypfs_info = mnt->mnt_sb->s_fs_info; + +seq_printf (s,",uid=%u" , hypfs_info->uid); +seq_printf (s,",gid=%u" , hypfs_info->gid); +return 0 ; +} +static int hypfs_fill_super (struct super_block *sb,void *data,int silent) {struct inode *root_inode;
@@ -459,6 +470,7 @@ static struct file_system_type hypfs_type = {static struct super_operations hypfs_s_ops = { .statfs = simple_statfs, .drop_inode = hypfs_drop_inode, + .show_options = hypfs_show_options, }; static decl_subsys(s390, NULL, NULL);
drivers/s390/char/monwriter.c +6 -0
@@ -17,6 +17,7 @@#include <linux/miscdevice.h> #include <linux/ctype.h> #include <linux/poll.h> +#include <linux/mutex.h> #include <asm/uaccess.h> #include <asm/ebcdic.h> #include <asm/io.h>
@@ -41,6 +42,7 @@ struct mon_private {size_t hdr_to_read;size_t data_to_read;struct mon_buf *current_buf; +struct mutex thread_mutex; };/*
@@ -179,6 +181,7 @@ static int monwrite_open(struct inode *inode, struct file *filp)return -ENOMEM ;INIT_LIST_HEAD (&monpriv->list); monpriv->hdr_to_read =sizeof (monpriv->hdr); +mutex_init (&monpriv->thread_mutex); filp->private_data = monpriv;return nonseekable_open (inode, filp); }
@@ -209,6 +212,7 @@ static ssize_t monwrite_write(struct file *filp, const char __user *data,void *to;int rc; +mutex_lock (&monpriv->thread_mutex);for (written =0 ; written < count; ) {if (monpriv->hdr_to_read) { len =min (count - written, monpriv->hdr_to_read);
@@ -247,11 +251,13 @@ static ssize_t monwrite_write(struct file *filp, const char __user *data, } monpriv->hdr_to_read =sizeof (monpriv->hdr); } +mutex_unlock (&monpriv->thread_mutex);return written; out_error: monpriv->data_to_read =0 ; monpriv->hdr_to_read =sizeof (struct monwrite_hdr ); +mutex_unlock (&monpriv->thread_mutex);return rc; }
drivers/s390/char/vmur.c +108 -68
279 lines not on this page · raw message
drivers/s390/char/vmur.h +4 -1
@@ -50,7 +50,10 @@ 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 +#define FLG_IN_USE 0x80/* * A struct urdev is created for each ur device that is made available
drivers/s390/cio/css.c +1 -0
@@ -79,6 +79,7 @@ css_alloc_subchannel(struct subchannel_id schid) sch->schib.pmcw.intparm = (__u32 )(unsigned long )sch; ret =cio_modify (sch);if (ret) { +kfree (sch->lock);kfree (sch);return ERR_PTR (ret); }
drivers/s390/cio/qdio.c +47 -45
158 lines not on this page · raw message