From: Nate Date: Mon, 16 Jul 2007 15:45:13 +0000 (+0000) Subject: [CIFS] use simple_prepare_write to zero page data X-Git-Tag: v2.6.23-rc1~478^2~6 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8803863a9051582081fb2bcca3a6dc8fddaed93c;p=linux-2.6 [CIFS] use simple_prepare_write to zero page data It's common for file systems to need to zero data on either side of a write, if a page is not Uptodate during prepare_write. It just so happens that simple_prepare_write() in libfs.c does exactly that, so we can avoid duplication and just call that function to zero page data. Signed-off-by: Nate Diller Signed-off-by: Andrew Morton Signed-off-by: Steve French --- diff --git a/fs/cifs/file.c b/fs/cifs/file.c index b67f1da020..0620feaaea 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1966,14 +1966,7 @@ static int cifs_prepare_write(struct file *file, struct page *page, * We don't need to read data beyond the end of the file. * zero it, and set the page uptodate */ - void *kaddr = kmap_atomic(page, KM_USER0); - - if (from) - memset(kaddr, 0, from); - if (to < PAGE_CACHE_SIZE) - memset(kaddr + to, 0, PAGE_CACHE_SIZE - to); - flush_dcache_page(page); - kunmap_atomic(kaddr, KM_USER0); + simple_prepare_write(file, page, from, to); SetPageUptodate(page); } else if ((file->f_flags & O_ACCMODE) != O_WRONLY) { /* might as well read a page, it is fast enough */