microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

generic_write_checks(): drop isblk argument 

all remaining callers are passing 0; some just obscure that fact.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-04-04 04:05:48 -04:00
Родитель 7ec7b94a33
Коммит 0fa6b005af
14 изменённых файлов: 36 добавлений и 60 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
fs/9p/vfs_file.c
Просмотреть файл

@ -409,7 +409,7 @@ v9fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
size_t count = iov_iter_count(from);
int err = 0;
retval = generic_write_checks(file, &origin, &count, 0);
retval = generic_write_checks(file, &origin, &count);
if (retval)
return retval;

2
fs/btrfs/file.c
Просмотреть файл

@ -1747,7 +1747,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
mutex_lock(&inode->i_mutex);
current->backing_dev_info = inode_to_bdi(inode);
err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
err = generic_write_checks(file, &pos, &count);
if (err) {
mutex_unlock(&inode->i_mutex);
goto out;

2
fs/ceph/file.c
Просмотреть файл

@ -953,7 +953,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
/* We can write back this queue in page reclaim */
current->backing_dev_info = inode_to_bdi(inode);
err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
err = generic_write_checks(file, &pos, &count);
if (err)
goto out;

4
fs/cifs/file.c
Просмотреть файл

@ -2580,7 +2580,7 @@ ssize_t cifs_user_writev(struct kiocb *iocb, struct iov_iter *from)
*/
len = iov_iter_count(from);
rc = generic_write_checks(file, &iocb->ki_pos, &len, 0);
rc = generic_write_checks(file, &iocb->ki_pos, &len);
if (rc)
return rc;
@ -2684,7 +2684,7 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
mutex_lock(&inode->i_mutex);
count = iov_iter_count(from);
rc = generic_write_checks(file, &iocb->ki_pos, &count, 0);
rc = generic_write_checks(file, &iocb->ki_pos, &count);
if (rc)
goto out;

2
fs/ext4/file.c
Просмотреть файл

@ -171,7 +171,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
}
}
ret = generic_write_checks(file, &iocb->ki_pos, &length, 0);
ret = generic_write_checks(file, &iocb->ki_pos, &length);
if (ret)
goto out;

6
fs/fuse/file.c
Просмотреть файл

@ -1167,7 +1167,7 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
/* We can write back this queue in page reclaim */
current->backing_dev_info = inode_to_bdi(inode);
err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
err = generic_write_checks(file, &pos, &count);
if (err)
goto out;
@ -1420,7 +1420,7 @@ static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from)
/* Don't allow parallel writes to the same file */
mutex_lock(&inode->i_mutex);
res = generic_write_checks(file, &iocb->ki_pos, &count, 0);
res = generic_write_checks(file, &iocb->ki_pos, &count);
if (!res) {
iov_iter_truncate(from, count);
res = fuse_direct_io(&io, from, &iocb->ki_pos, FUSE_DIO_WRITE);
@ -2841,7 +2841,7 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)
io->done = &wait;
if (iov_iter_rw(iter) == WRITE) {
ret = generic_write_checks(file, &pos, &count, 0);
ret = generic_write_checks(file, &pos, &count);
if (!ret) {
iov_iter_truncate(iter, count);
ret = fuse_direct_io(io, iter, &pos, FUSE_DIO_WRITE);

2
fs/ncpfs/file.c
Просмотреть файл

@ -177,7 +177,7 @@ ncp_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
void *bouncebuffer;
ncp_dbg(1, "enter %pD2\n", file);
errno = generic_write_checks(file, &pos, &count, 0);
errno = generic_write_checks(file, &pos, &count);
if (errno)
return errno;
iov_iter_truncate(from, count);

2
fs/nfs/direct.c
Просмотреть файл

@ -977,7 +977,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter,
dfprintk(FILE, "NFS: direct write(%pD2, %zd@%Ld)\n",
file, count, (long long) pos);
result = generic_write_checks(file, &pos, &count, 0);
result = generic_write_checks(file, &pos, &count);
if (result)
goto out;

2
fs/ntfs/file.c
Просмотреть файл

@ -345,7 +345,7 @@ static ssize_t ntfs_prepare_file_for_write(struct kiocb *iocb,
"0x%llx, count 0x%zx.", vi->i_ino,
(unsigned)le32_to_cpu(ni->type),
(unsigned long long)iocb->ki_pos, count);
err = generic_write_checks(file, &iocb->ki_pos, &count, S_ISBLK(vi->i_mode));
err = generic_write_checks(file, &iocb->ki_pos, &count);
if (unlikely(err))
goto out;
iov_iter_truncate(from, count);

3
fs/ocfs2/file.c
Просмотреть файл

@ -2374,8 +2374,7 @@ relock:
/* communicate with ocfs2_dio_end_io */
ocfs2_iocb_set_rw_locked(iocb, rw_level);
ret = generic_write_checks(file, ppos, &count,
S_ISBLK(inode->i_mode));
ret = generic_write_checks(file, ppos, &count);
if (ret)
goto out_dio;

2
fs/udf/file.c
Просмотреть файл

@ -151,7 +151,7 @@ static ssize_t udf_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
} else
up_write(&iinfo->i_data_sem);
retval = generic_write_checks(file, &iocb->ki_pos, &count, 0);
retval = generic_write_checks(file, &iocb->ki_pos, &count);
if (retval)
goto out;

2
fs/xfs/xfs_file.c
Просмотреть файл

@ -554,7 +554,7 @@ xfs_file_aio_write_checks(
int error = 0;
restart:
error = generic_write_checks(file, pos, count, S_ISBLK(inode->i_mode));
error = generic_write_checks(file, pos, count);
if (error)
return error;

2
include/linux/fs.h
Просмотреть файл

@ -2566,7 +2566,7 @@ extern int sb_min_blocksize(struct super_block *, int);
extern int generic_file_mmap(struct file *, struct vm_area_struct *);
extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);
int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
int generic_write_checks(struct file *file, loff_t *pos, size_t *count);
extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *);
extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *);
extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *);

63
mm/filemap.c
Просмотреть файл

@ -2260,7 +2260,7 @@ EXPORT_SYMBOL(read_cache_page_gfp);
* Returns appropriate error code that caller should return or
* zero in case that write should be allowed.
*/
inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk)
inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count)
{
struct inode *inode = file->f_mapping->host;
unsigned long limit = rlimit(RLIMIT_FSIZE);
@ -2268,20 +2268,17 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
if (unlikely(*pos < 0))
return -EINVAL;
if (!isblk) {
/* FIXME: this is for backwards compatibility with 2.4 */
if (file->f_flags & O_APPEND)
*pos = i_size_read(inode);
/* FIXME: this is for backwards compatibility with 2.4 */
if (file->f_flags & O_APPEND)
*pos = i_size_read(inode);
if (limit != RLIM_INFINITY) {
if (*pos >= limit) {
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
}
if (*count > limit - (typeof(limit))*pos) {
*count = limit - (typeof(limit))*pos;
}
if (limit != RLIM_INFINITY) {
if (*pos >= limit) {
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
}
if (*count > limit - (typeof(limit))*pos)
*count = limit - (typeof(limit))*pos;
}
/*
@ -2289,12 +2286,10 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
*/
if (unlikely(*pos + *count > MAX_NON_LFS &&
!(file->f_flags & O_LARGEFILE))) {
if (*pos >= MAX_NON_LFS) {
if (*pos >= MAX_NON_LFS)
return -EFBIG;
}
if (*count > MAX_NON_LFS - (unsigned long)*pos) {
if (*count > MAX_NON_LFS - (unsigned long)*pos)
*count = MAX_NON_LFS - (unsigned long)*pos;
}
}
/*
@ -2304,33 +2299,15 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
* exceeded without writing data we send a signal and return EFBIG.
* Linus frestrict idea will clean these up nicely..
*/
if (likely(!isblk)) {
if (unlikely(*pos >= inode->i_sb->s_maxbytes)) {
if (*count || *pos > inode->i_sb->s_maxbytes) {
return -EFBIG;
}
/* zero-length writes at ->s_maxbytes are OK */
if (unlikely(*pos >= inode->i_sb->s_maxbytes)) {
if (*count || *pos > inode->i_sb->s_maxbytes) {
return -EFBIG;
}
if (unlikely(*pos + *count > inode->i_sb->s_maxbytes))
*count = inode->i_sb->s_maxbytes - *pos;
} else {
#ifdef CONFIG_BLOCK
loff_t isize;
if (bdev_read_only(I_BDEV(inode)))
return -EPERM;
isize = i_size_read(inode);
if (*pos >= isize) {
if (*count || *pos > isize)
return -ENOSPC;
}
if (*pos + *count > isize)
*count = isize - *pos;
#else
return -EPERM;
#endif
/* zero-length writes at ->s_maxbytes are OK */
}
if (unlikely(*pos + *count > inode->i_sb->s_maxbytes))
*count = inode->i_sb->s_maxbytes - *pos;
return 0;
}
EXPORT_SYMBOL(generic_write_checks);
@ -2644,7 +2621,7 @@ ssize_t generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
size_t count = iov_iter_count(from);
mutex_lock(&inode->i_mutex);
ret = generic_write_checks(file, &iocb->ki_pos, &count, 0);
ret = generic_write_checks(file, &iocb->ki_pos, &count);
if (!ret && count) {
iov_iter_truncate(from, count);
ret = __generic_file_write_iter(iocb, from);