Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 191563
b: refs/heads/master
c: 58ea91c
h: refs/heads/master
i:
  191561: bc21345
  191559: b44bc30
v: v3
  • Loading branch information
Martin Schwidefsky authored and Martin Schwidefsky committed May 17, 2010
1 parent 9342800 commit e150d00
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 5 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: f73a2b03c59b95a3ee8eebcc127350c77c950e87
refs/heads/master: 58ea91c05346f7c6336e6248b743aa9a8e1c19a9
2 changes: 1 addition & 1 deletion trunk/arch/s390/hypfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ static int hypfs_open(struct inode *inode, struct file *filp)
}
mutex_unlock(&fs_info->lock);
}
return 0;
return nonseekable_open(inode, filp);
}

static ssize_t hypfs_aio_read(struct kiocb *iocb, const struct iovec *iov,
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/s390/kernel/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,7 @@ debug_open(struct inode *inode, struct file *file)
p_info->act_entry_offset = 0;
file->private_data = p_info;
debug_info_get(debug_info);
nonseekable_open(inode, file);
out:
mutex_unlock(&debug_mutex);
return rc;
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/s390/char/fs3270.c
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,7 @@ fs3270_open(struct inode *inode, struct file *filp)
raw3270_del_view(&fp->view);
goto out;
}
nonseekable_open(inode, filp);
filp->private_data = fp;
out:
mutex_unlock(&fs3270_mutex);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/s390/char/zcore.c
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ static int zcore_memmap_open(struct inode *inode, struct file *filp)
}
kfree(chunk_array);
filp->private_data = buf;
return 0;
return nonseekable_open(inode, filp);
}

static int zcore_memmap_release(struct inode *inode, struct file *filp)
Expand Down Expand Up @@ -473,7 +473,7 @@ static ssize_t zcore_reipl_write(struct file *filp, const char __user *buf,

static int zcore_reipl_open(struct inode *inode, struct file *filp)
{
return 0;
return nonseekable_open(inode, filp);
}

static int zcore_reipl_release(struct inode *inode, struct file *filp)
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/s390/cio/chsc_sch.c
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,7 @@ static long chsc_ioctl(struct file *filp, unsigned int cmd,

static const struct file_operations chsc_fops = {
.owner = THIS_MODULE,
.open = nonseekable_open,
.unlocked_ioctl = chsc_ioctl,
.compat_ioctl = chsc_ioctl,
};
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/s390/cio/css.c
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,7 @@ static ssize_t cio_settle_write(struct file *file, const char __user *buf,
}

static const struct file_operations cio_settle_proc_fops = {
.open = nonseekable_open,
.write = cio_settle_write,
};

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/s390/crypto/zcrypt_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ static ssize_t zcrypt_write(struct file *filp, const char __user *buf,
static int zcrypt_open(struct inode *inode, struct file *filp)
{
atomic_inc(&zcrypt_open_count);
return 0;
return nonseekable_open(inode, filp);
}

/**
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/s390/scsi/zfcp_cfdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ static long zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command,
}

static const struct file_operations zfcp_cfdc_fops = {
.open = nonseekable_open,
.unlocked_ioctl = zfcp_cfdc_dev_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = zfcp_cfdc_dev_ioctl
Expand Down

0 comments on commit e150d00

Please sign in to comment.