libfs: Unexport and kill simple_prepare_write

Remove the EXPORT_UNUSED_SYMBOL of simple_prepare_write

Collapse simple_prepare_write into it's only caller, though
making it simpler and clearer to understand.

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/libfs.c b/fs/libfs.c
index cd88abdcb4368944276baab70d3de90eca8d4c1c..9e50bcf55857eaebd8fc4106f21bae8ad69afbf1 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -338,28 +338,14 @@ int simple_readpage(struct file *file, struct page *page)
        return 0;
 }
 
-int simple_prepare_write(struct file *file, struct page *page,
-                       unsigned from, unsigned to)
-{
-       if (!PageUptodate(page)) {
-               if (to - from != PAGE_CACHE_SIZE)
-                       zero_user_segments(page,
-                               0, from,
-                               to, PAGE_CACHE_SIZE);
-       }
-       return 0;
-}
-
 int simple_write_begin(struct file *file, struct address_space *mapping,
                        loff_t pos, unsigned len, unsigned flags,
                        struct page **pagep, void **fsdata)
 {
        struct page *page;
        pgoff_t index;
-       unsigned from;
 
        index = pos >> PAGE_CACHE_SHIFT;
-       from = pos & (PAGE_CACHE_SIZE - 1);
 
        page = grab_cache_page_write_begin(mapping, index, flags);
        if (!page)
@@ -367,7 +353,12 @@ int simple_write_begin(struct file *file, struct address_space *mapping,
 
        *pagep = page;
 
-       return simple_prepare_write(file, page, from, from+len);
+       if (!PageUptodate(page) && (len != PAGE_CACHE_SIZE)) {
+               unsigned from = pos & (PAGE_CACHE_SIZE - 1);
+
+               zero_user_segments(page, 0, from, from + len, PAGE_CACHE_SIZE);
+       }
+       return 0;
 }
 
 /**
@@ -864,7 +855,6 @@ EXPORT_SYMBOL(simple_getattr);
 EXPORT_SYMBOL(simple_link);
 EXPORT_SYMBOL(simple_lookup);
 EXPORT_SYMBOL(simple_pin_fs);
-EXPORT_UNUSED_SYMBOL(simple_prepare_write);
 EXPORT_SYMBOL(simple_readpage);
 EXPORT_SYMBOL(simple_release_fs);
 EXPORT_SYMBOL(simple_rename);

diff --git a/include/linux/fs.h b/include/linux/fs.h
index ebb1cd5bc2419c7fad8b421178021d52ac005fea..2b124c825e38414e4a83882a9e1b6091abef39c2 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2340,8 +2340,6 @@ extern int simple_rename(struct inode *, struct dentry *, struct inode *, struct
 extern int simple_sync_file(struct file *, struct dentry *, int);
 extern int simple_empty(struct dentry *);
 extern int simple_readpage(struct file *file, struct page *page);
-extern int simple_prepare_write(struct file *file, struct page *page,
-                       unsigned offset, unsigned to);
 extern int simple_write_begin(struct file *file, struct address_space *mapping,
                        loff_t pos, unsigned len, unsigned flags,
                        struct page **pagep, void **fsdata);