Skip to content

Commit ccad236

Browse files
author
Al Viro
committed
kill generic_file_buffered_write()
Signed-off-by: Al Viro <[email protected]>
1 parent 58bfab3 commit ccad236

File tree

2 files changed

+1
-24
lines changed

2 files changed

+1
-24
lines changed

include/linux/fs.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2398,8 +2398,6 @@ extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsi
23982398
extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *,
23992399
unsigned long *, loff_t, size_t, size_t);
24002400
extern ssize_t generic_perform_write(struct file *, struct iov_iter *, loff_t);
2401-
extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
2402-
unsigned long, loff_t, size_t, ssize_t);
24032401
extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
24042402
extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
24052403
extern int generic_segment_checks(const struct iovec *iov,

mm/filemap.c

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
* ->mmap_sem
7777
* ->lock_page (access_process_vm)
7878
*
79-
* ->i_mutex (generic_file_buffered_write)
79+
* ->i_mutex (generic_perform_write)
8080
* ->mmap_sem (fault_in_pages_readable->do_page_fault)
8181
*
8282
* bdi->wb.list_lock
@@ -2182,27 +2182,6 @@ ssize_t generic_perform_write(struct file *file,
21822182
}
21832183
EXPORT_SYMBOL(generic_perform_write);
21842184

2185-
ssize_t
2186-
generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
2187-
unsigned long nr_segs, loff_t pos,
2188-
size_t count, ssize_t written)
2189-
{
2190-
struct file *file = iocb->ki_filp;
2191-
ssize_t status;
2192-
struct iov_iter i;
2193-
2194-
iov_iter_init(&i, iov, nr_segs, count, written);
2195-
status = generic_perform_write(file, &i, pos);
2196-
2197-
if (likely(status >= 0)) {
2198-
written += status;
2199-
iocb->ki_pos = pos + status;
2200-
}
2201-
2202-
return written ? written : status;
2203-
}
2204-
EXPORT_SYMBOL(generic_file_buffered_write);
2205-
22062185
/**
22072186
* __generic_file_aio_write - write data to a file
22082187
* @iocb: IO state structure (file, offset, etc.)

0 commit comments

Comments
 (0)