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>

1 files changed, 20 insertions, 43 deletions

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);