summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fs/9p/vfs_file.c2
-rw-r--r--fs/btrfs/file.c2
-rw-r--r--fs/ceph/file.c2
-rw-r--r--fs/cifs/file.c4
-rw-r--r--fs/ext4/file.c2
-rw-r--r--fs/fuse/file.c6
-rw-r--r--fs/ncpfs/file.c2
-rw-r--r--fs/nfs/direct.c2
-rw-r--r--fs/ntfs/file.c2
-rw-r--r--fs/ocfs2/file.c3
-rw-r--r--fs/udf/file.c2
-rw-r--r--fs/xfs/xfs_file.c2
-rw-r--r--include/linux/fs.h2
-rw-r--r--mm/filemap.c63
14 files changed, 36 insertions, 60 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index d7fcb775311e..b5b020ace1b3 100644
--- a/fs/9p/vfs_file.c
+++ b/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;
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index cdc801c85105..691a84a81e09 100644
--- a/fs/btrfs/file.c
+++ b/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;
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 56237ea5fc22..761841903160 100644
--- a/fs/ceph/file.c
+++ b/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;
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 3c5c9bc5cbaf..4202e74b2db5 100644
--- a/fs/cifs/file.c
+++ b/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;
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index f7cca423dded..1f0afc181b7b 100644
--- a/fs/ext4/file.c
+++ b/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;
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 3d355e946991..4c04a8144a75 100644
--- a/fs/fuse/file.c
+++ b/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);
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c
index 479bf8db264e..ab6363b16556 100644
--- a/fs/ncpfs/file.c
+++ b/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);
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 06503bc604e1..5ddd77acb3f7 100644
--- a/fs/nfs/direct.c
+++ b/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;
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 77087d5ad458..cec4ec3c1ede 100644
--- a/fs/ntfs/file.c
+++ b/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);
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 0a6ec7e6efd8..1c11314946cb 100644
--- a/fs/ocfs2/file.c
+++ b/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;
diff --git a/fs/udf/file.c b/fs/udf/file.c
index 35e81ed99405..6834509a7e5a 100644
--- a/fs/udf/file.c
+++ b/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;
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 44856c3b9617..43c0e6686c47 100644
--- a/fs/xfs/xfs_file.c
+++ b/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;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 72e3759de8c3..492948ea4c9b 100644
--- a/include/linux/fs.h
+++ b/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 *);
diff --git a/mm/filemap.c b/mm/filemap.c
index a794a7f98743..dfc573c6ec25 100644
--- a/mm/filemap.c
+++ b/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 + *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 (unlikely(*pos >= inode->i_sb->s_maxbytes)) {
+ if (*count || *pos > inode->i_sb->s_maxbytes) {
+ return -EFBIG;
}
-
- 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);
generated by cgit v1.2.3 (git 2.39.0) at 2024-11-06 16:34:50 +0300