3 files changed, 20 insertions, 15 deletions

diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index e95d3131309e..fe7afe225381 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -189,7 +189,7 @@ prototypes:
                                 loff_t pos, unsigned len, unsigned copied,
                                 struct page *page, void *fsdata);
         sector_t (*bmap)(struct address_space *, sector_t);
-        int (*invalidatepage) (struct page *, unsigned long);
+        void (*invalidatepage) (struct page *, unsigned int, unsigned int);
         int (*releasepage) (struct page *, int);
         void (*freepage)(struct page *);
         int (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
@@ -310,8 +310,8 @@ filesystems and by the swapper. The latter will eventually go away.  Please,
 keep it that way and don't breed new callers.
 
         ->invalidatepage() is called when the filesystem must attempt to drop
-some or all of the buffers from the page when it is being truncated.  It
-returns zero on success.  If ->invalidatepage is zero, the kernel uses
+some or all of the buffers from the page when it is being truncated. It
+returns zero on success. If ->invalidatepage is zero, the kernel uses
 block_invalidatepage() instead.
 
         ->releasepage() is called when the kernel is about to try to drop the
diff --git a/Documentation/filesystems/f2fs.txt b/Documentation/filesystems/f2fs.txt
index bd3c56c67380..b91e2f26b672 100644
--- a/Documentation/filesystems/f2fs.txt
+++ b/Documentation/filesystems/f2fs.txt
@@ -98,8 +98,13 @@ Cleaning Overhead
 MOUNT OPTIONS
 ================================================================================
 
-background_gc_off      Turn off cleaning operations, namely garbage collection,
-                       triggered in background when I/O subsystem is idle.
+background_gc=%s       Turn on/off cleaning operations, namely garbage
+                       collection, triggered in background when I/O subsystem is
+                       idle. If background_gc=on, it will turn on the garbage
+                       collection and if background_gc=off, garbage collection
+                       will be truned off.
+                       Default value for this option is on. So garbage
+                       collection is on by default.
 disable_roll_forward   Disable the roll-forward recovery routine
 discard                Issue discard/TRIM commands when a segment is cleaned.
 no_heap                Disable heap-style segment allocation which finds free
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index aeff462c7228..1f0ba30ae47e 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -554,7 +554,7 @@ struct address_space_operations
 -------------------------------
 
 This describes how the VFS can manipulate mapping of a file to page cache in
-your filesystem. As of kernel 2.6.22, the following members are defined:
+your filesystem. The following members are defined:
 
 struct address_space_operations {
         int (*writepage)(struct page *page, struct writeback_control *wbc);
@@ -571,7 +571,7 @@ struct address_space_operations {
                                 loff_t pos, unsigned len, unsigned copied,
                                 struct page *page, void *fsdata);
         sector_t (*bmap)(struct address_space *, sector_t);
-        int (*invalidatepage) (struct page *, unsigned long);
+        void (*invalidatepage) (struct page *, unsigned int, unsigned int);
         int (*releasepage) (struct page *, int);
         void (*freepage)(struct page *);
         ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
@@ -690,14 +690,14 @@ struct address_space_operations {
   invalidatepage: If a page has PagePrivate set, then invalidatepage
         will be called when part or all of the page is to be removed
         from the address space.  This generally corresponds to either a
-        truncation or a complete invalidation of the address space
-        (in the latter case 'offset' will always be 0).
-        Any private data associated with the page should be updated
-        to reflect this truncation.  If offset is 0, then
-        the private data should be released, because the page
-        must be able to be completely discarded.  This may be done by
-        calling the ->releasepage function, but in this case the
-        release MUST succeed.
+        truncation, punch hole  or a complete invalidation of the address
+        space (in the latter case 'offset' will always be 0 and 'length'
+        will be PAGE_CACHE_SIZE). Any private data associated with the page
+        should be updated to reflect this truncation.  If offset is 0 and
+        length is PAGE_CACHE_SIZE, then the private data should be released,
+        because the page must be able to be completely discarded.  This may
+        be done by calling the ->releasepage function, but in this case the
+        release MUST succeed.
 
   releasepage: releasepage is called on PagePrivate pages to indicate
         that the page should be freed if possible.  ->releasepage