Skip to content

Commit

Permalink
[PATCH] msync(): use do_fsync()
Browse files Browse the repository at this point in the history
No need to duplicate all that code.

Cc: Hugh Dickins <hugh@veritas.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Mar 24, 2006
1 parent 18e79b4 commit 8f2e9f1
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions mm/msync.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/
#include <linux/slab.h>
#include <linux/pagemap.h>
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/mman.h>
#include <linux/hugetlb.h>
Expand Down Expand Up @@ -214,23 +215,9 @@ asmlinkage long sys_msync(unsigned long start, size_t len, int flags)
vma = find_vma(current->mm, start);
} else if ((flags & MS_SYNC) && file &&
(vma->vm_flags & VM_SHARED)) {
struct address_space *mapping;
int err;

get_file(file);
up_read(&current->mm->mmap_sem);
mapping = file->f_mapping;
error = filemap_fdatawrite(mapping);
if (file->f_op && file->f_op->fsync) {
mutex_lock(&mapping->host->i_mutex);
err = file->f_op->fsync(file,file->f_dentry,1);
mutex_unlock(&mapping->host->i_mutex);
if (err && !error)
error = err;
}
err = filemap_fdatawait(mapping);
if (err && !error)
error = err;
error = do_fsync(file, 0);
fput(file);
down_read(&current->mm->mmap_sem);
if (error)
Expand Down

0 comments on commit 8f2e9f1

Please sign in to comment.