Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7882d6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull VFS fixes and cleanups from Al Viro.

Most of this is the series to remove sync_supers() and the
->write_supers VFS callback from Artem Bityutskiy.  One commit to do the
actual removal work, a whole series of commits to fix up stale comments
etc all over the tree.

There's also a regression fix for an incorrect use of mnt_drop_write()
in do_dentry_open().

* 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  missed mnt_drop_write() in do_dentry_open()
  UBIFS: nuke pdflush from comments
  gfs2: nuke pdflush from comments
  drbd: nuke pdflush from comments
  nilfs2: nuke write_super from comments
  hfs: nuke write_super from comments
  vfs: nuke pdflush from comments
  jbd/jbd2: nuke write_super from comments
  btrfs: nuke pdflush from comments
  btrfs: nuke write_super from comments
  ext4: nuke pdflush from comments
  ext4: nuke write_super from comments
  ext3: nuke write_super from comments
  Documentation: fix the VM knobs descritpion WRT pdflush
  Documentation: get rid of write_super
  vfs: kill write_super and sync_supers
parents d8579fd8 fe7c8051

Documentation/DocBook/filesystems.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -224,8 +224,8 @@ all your transactions. 
</para>



<para>

Then at umount time , in your put_super() (2.4) or write_super() (2.5)

you can then call journal_destroy() to clean up your in-core journal object.

Then at umount time , in your put_super() you can then call journal_destroy()

to clean up your in-core journal object.

</para>



<para>

Documentation/filesystems/Locking

+0 −2
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ prototypes: 
	int (*drop_inode) (struct inode *);

	void (*evict_inode) (struct inode *);

	void (*put_super) (struct super_block *);

	void (*write_super) (struct super_block *);

	int (*sync_fs)(struct super_block *sb, int wait);

	int (*freeze_fs) (struct super_block *);

	int (*unfreeze_fs) (struct super_block *);
@@ -136,7 +135,6 @@ write_inode: 
drop_inode:				!!!inode->i_lock!!!

evict_inode:

put_super:		write

write_super:		read

sync_fs:		read

freeze_fs:		write

unfreeze_fs:		write

Documentation/filesystems/porting

+2 −3
Original line number Diff line number Diff line
@@ -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]

Documentation/filesystems/vfs.txt

+0 −4
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ struct super_operations { 
        void (*drop_inode) (struct inode *);

        void (*delete_inode) (struct inode *);

        void (*put_super) (struct super_block *);

        void (*write_super) (struct super_block *);

        int (*sync_fs)(struct super_block *sb, int wait);

        int (*freeze_fs) (struct super_block *);

        int (*unfreeze_fs) (struct super_block *);
@@ -273,9 +272,6 @@ or bottom half). 
  put_super: called when the VFS wishes to free the superblock

	(i.e. unmount). This is called with the superblock lock held



  write_super: called when the VFS superblock needs to be written to

	disc. This method is optional



  sync_fs: called when VFS is writing out all dirty data associated with

  	a superblock. The second parameter indicates whether the method

	should wait until the write out has been completed. Optional.

Documentation/laptops/laptop-mode.txt

+6 −6
Original line number Diff line number Diff line
@@ -262,9 +262,9 @@ MINIMUM_BATTERY_MINUTES=10 


#

# Allowed dirty background ratio, in percent.  Once DIRTY_RATIO has been

# exceeded, the kernel will wake pdflush which will then reduce the amount

# of dirty memory to dirty_background_ratio.  Set this nice and low, so once

# some writeout has commenced, we do a lot of it.

# exceeded, the kernel will wake flusher threads which will then reduce the

# amount of dirty memory to dirty_background_ratio.  Set this nice and low,

# so once some writeout has commenced, we do a lot of it.

#

#DIRTY_BACKGROUND_RATIO=5
@@ -384,9 +384,9 @@ CPU_MAXFREQ=${CPU_MAXFREQ:-'slowest'} 


#

# Allowed dirty background ratio, in percent.  Once DIRTY_RATIO has been

# exceeded, the kernel will wake pdflush which will then reduce the amount

# of dirty memory to dirty_background_ratio.  Set this nice and low, so once

# some writeout has commenced, we do a lot of it.

# exceeded, the kernel will wake flusher threads which will then reduce the

# amount of dirty memory to dirty_background_ratio.  Set this nice and low,

# so once some writeout has commenced, we do a lot of it.

#

DIRTY_BACKGROUND_RATIO=${DIRTY_BACKGROUND_RATIO:-'5'}