Merge remote-tracking branch 'regulator/topic/lp8788' into regulator-next

[karo-tx-linux.git] / Documentation / filesystems / porting

diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting
index 2bef2b3843d1d4e09ead99fed121de4b2ab92db2..0472c31c163b4de67d73a52d8aa1953597df8ca1 100644 (file)
--- a/Documentation/filesystems/porting
+++ b/Documentation/filesystems/porting
@@ -94,9 +94,8 @@ protected.
 ---
 [mandatory]
 
-BKL is also moved from around sb operations.  ->write_super() Is now called 
-without BKL held.  BKL should have been shifted into individual fs sb_op
-functions.  If you don't need it, remove it.  
+BKL is also moved from around sb operations. BKL should have been shifted into
+individual fs sb_op functions.  If you don't need it, remove it.
 
 ---
 [informational]
@@ -282,7 +281,7 @@ ext2_write_failed and callers for an example.
 
 [mandatory]
 
-       ->truncate is going away.  The whole truncate sequence needs to be
+       ->truncate is gone.  The whole truncate sequence needs to be
 implemented in ->setattr, which is now mandatory for filesystems
 implementing on-disk size changes.  Start with a copy of the old inode_setattr
 and vmtruncate, and the reorder the vmtruncate + foofs_vmtruncate sequence to