Commit 5402b976 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

shmem_file_write is redundant

With the old aops, writing to a tmpfs file had to use its own special method:
the generic method would pass in a fresh page to prepare_write when the right
page was there in swapcache - which was inefficient to handle, even once we'd
concocted the code to handle it.

With the new aops, the generic method uses shmem_write_end, which lets
shmem_getpage find the right page: so now abandon shmem_file_write in favour
of the generic method.  Yes, that does do several things that tmpfs hasn't
really needed (notably balance_dirty_pages_ratelimited, which ramfs also
calls); but more use of common code is preferable.
Signed-off-by: default avatarHugh Dickins <>
Cc: Nick Piggin <>
Acked-by: default avatarRik van Riel <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent d3602444
......@@ -1106,7 +1106,7 @@ static int shmem_getpage(struct inode *inode, unsigned long idx,
* Normally, filepage is NULL on entry, and either found
* uptodate immediately, or allocated and zeroed, or read
* in under swappage, which is then assigned to filepage.
* But shmem_readpage and shmem_write_begin pass in a locked
* But shmem_readpage (required for splice) passes in a locked
* filepage, which may be found not uptodate by other callers
* too, and may need to be copied from the swappage read in.
......@@ -1476,110 +1476,6 @@ shmem_write_end(struct file *file, struct address_space *mapping,
return copied;
static ssize_t
shmem_file_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
struct inode *inode = file->f_path.dentry->d_inode;
loff_t pos;
unsigned long written;
ssize_t err;
if ((ssize_t) count < 0)
return -EINVAL;
if (!access_ok(VERIFY_READ, buf, count))
return -EFAULT;
pos = *ppos;
written = 0;
err = generic_write_checks(file, &pos, &count, 0);
if (err || !count)
goto out;
err = remove_suid(file->f_path.dentry);
if (err)
goto out;
inode->i_ctime = inode->i_mtime = CURRENT_TIME;
do {
struct page *page = NULL;
unsigned long bytes, index, offset;
char *kaddr;
int left;
offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */
index = pos >> PAGE_CACHE_SHIFT;
bytes = PAGE_CACHE_SIZE - offset;
if (bytes > count)
bytes = count;
* We don't hold page lock across copy from user -
* what would it guard against? - so no deadlock here.
* But it still may be a good idea to prefault below.
err = shmem_getpage(inode, index, &page, SGP_WRITE, NULL);
if (err)
left = bytes;
if (PageHighMem(page)) {
volatile unsigned char dummy;
__get_user(dummy, buf);
__get_user(dummy, buf + bytes - 1);
kaddr = kmap_atomic(page, KM_USER0);
left = __copy_from_user_inatomic(kaddr + offset,
buf, bytes);
kunmap_atomic(kaddr, KM_USER0);
if (left) {
kaddr = kmap(page);
left = __copy_from_user(kaddr + offset, buf, bytes);
written += bytes;
count -= bytes;
pos += bytes;
buf += bytes;
if (pos > inode->i_size)
i_size_write(inode, pos);
if (left) {
pos -= left;
written -= left;
err = -EFAULT;
* Our dirty pages are not counted in nr_dirty,
* and we do not attempt to balance dirty pages.
} while (count);
*ppos = pos;
if (written)
err = written;
return err;
static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc, read_actor_t actor)
struct inode *inode = filp->f_path.dentry->d_inode;
......@@ -2354,7 +2250,8 @@ static const struct file_operations shmem_file_operations = {
.llseek = generic_file_llseek,
.read = shmem_file_read,
.write = shmem_file_write,
.write = do_sync_write,
.aio_write = generic_file_aio_write,
.fsync = simple_sync_file,
.splice_read = generic_file_splice_read,
.splice_write = generic_file_splice_write,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment