Commit 7d9071a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull vfs updates from Al Viro:
 "In this one:

   - d_move fixes (Eric Biederman)

   - UFS fixes (me; locking is mostly sane now, a bunch of bugs in error
     handling ought to be fixed)

   - switch of sb_writers to percpu rwsem (Oleg Nesterov)

   - superblock scalability (Josef Bacik and Dave Chinner)

   - swapon(2) race fix (Hugh Dickins)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (65 commits)
  vfs: Test for and handle paths that are unreachable from their mnt_root
  dcache: Reduce the scope of i_lock in d_splice_alias
  dcache: Handle escaped paths in prepend_path
  mm: fix potential data race in SyS_swapon
  inode: don't softlockup when evicting inodes
  inode: rename i_wb_list to i_io_list
  sync: serialise per-superblock sync operations
  inode: convert inode_sb_list_lock to per-sb
  inode: add hlist_fake to avoid the inode hash lock in evict
  writeback: plug writeback at a high level
  change sb_writers to use percpu_rw_semaphore
  shift percpu_counter_destroy() into destroy_super_work()
  percpu-rwsem: kill CONFIG_PERCPU_RWSEM
  percpu-rwsem: introduce percpu_rwsem_release() and percpu_rwsem_acquire()
  percpu-rwsem: introduce percpu_down_read_trylock()
  document rwsem_release() in sb_wait_write()
  fix the broken lockdep logic in __sb_start_write()
  introduce __sb_writers_{acquired,release}() helpers
  ufs_inode_get{frag,block}(): get rid of 'phys' argument
  ufs_getfrag_block(): tidy up a bit
  ...
parents bd779669 397d425d

arch/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ config KPROBES_ON_FTRACE 


config UPROBES

	def_bool n

	select PERCPU_RWSEM

	help

	  Uprobes is the user-space counterpart to kprobes: they

	  enable instrumentation applications (such as 'perf probe')

fs/block_dev.c

+6 −6
Original line number Diff line number Diff line
@@ -1769,7 +1769,7 @@ void iterate_bdevs(void (*func)(struct block_device *, void *), void *arg) 
{

	struct inode *inode, *old_inode = NULL;



	spin_lock(&inode_sb_list_lock);

	spin_lock(&blockdev_superblock->s_inode_list_lock);

	list_for_each_entry(inode, &blockdev_superblock->s_inodes, i_sb_list) {

		struct address_space *mapping = inode->i_mapping;
@@ -1781,13 +1781,13 @@ void iterate_bdevs(void (*func)(struct block_device *, void *), void *arg) 
		}

		__iget(inode);

		spin_unlock(&inode->i_lock);

		spin_unlock(&inode_sb_list_lock);

		spin_unlock(&blockdev_superblock->s_inode_list_lock);

		/*

		 * We hold a reference to 'inode' so it couldn't have been

		 * removed from s_inodes list while we dropped the

		 * inode_sb_list_lock.  We cannot iput the inode now as we can

		 * s_inode_list_lock  We cannot iput the inode now as we can

		 * be holding the last reference and we cannot iput it under

		 * inode_sb_list_lock. So we keep the reference and iput it

		 * s_inode_list_lock. So we keep the reference and iput it

		 * later.

		 */

		iput(old_inode);
@@ -1795,8 +1795,8 @@ void iterate_bdevs(void (*func)(struct block_device *, void *), void *arg) 


		func(I_BDEV(inode), arg);



		spin_lock(&inode_sb_list_lock);

		spin_lock(&blockdev_superblock->s_inode_list_lock);

	}

	spin_unlock(&inode_sb_list_lock);

	spin_unlock(&blockdev_superblock->s_inode_list_lock);

	iput(old_inode);

}

fs/btrfs/transaction.c

+2 −6
Original line number Diff line number Diff line
@@ -1640,9 +1640,7 @@ static void do_async_commit(struct work_struct *work) 
	 * Tell lockdep about it.

	 */

	if (ac->newtrans->type & __TRANS_FREEZABLE)

		rwsem_acquire_read(

		     &ac->root->fs_info->sb->s_writers.lock_map[SB_FREEZE_FS-1],

		     0, 1, _THIS_IP_);

		__sb_writers_acquired(ac->root->fs_info->sb, SB_FREEZE_FS);



	current->journal_info = ac->newtrans;
@@ -1681,9 +1679,7 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans, 
	 * async commit thread will be the one to unlock it.

	 */

	if (ac->newtrans->type & __TRANS_FREEZABLE)

		rwsem_release(

			&root->fs_info->sb->s_writers.lock_map[SB_FREEZE_FS-1],

			1, _THIS_IP_);

		__sb_writers_release(root->fs_info->sb, SB_FREEZE_FS);



	schedule_work(&ac->work);

fs/dcache.c

+10 −4
Original line number Diff line number Diff line
@@ -2718,7 +2718,7 @@ struct dentry *d_ancestor(struct dentry *p1, struct dentry *p2) 
 * This helper attempts to cope with remotely renamed directories

 *

 * It assumes that the caller is already holding

 * dentry->d_parent->d_inode->i_mutex, inode->i_lock and rename_lock

 * dentry->d_parent->d_inode->i_mutex, and rename_lock

 *

 * Note: If ever the locking in lock_rename() changes, then please

 * remember to update this too...
@@ -2744,7 +2744,6 @@ out_unalias: 
	__d_move(alias, dentry, false);

	ret = 0;

out_err:

	spin_unlock(&inode->i_lock);

	if (m2)

		mutex_unlock(m2);

	if (m1)
@@ -2790,10 +2789,11 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry) 
	if (S_ISDIR(inode->i_mode)) {

		struct dentry *new = __d_find_any_alias(inode);

		if (unlikely(new)) {

			/* The reference to new ensures it remains an alias */

			spin_unlock(&inode->i_lock);

			write_seqlock(&rename_lock);

			if (unlikely(d_ancestor(new, dentry))) {

				write_sequnlock(&rename_lock);

				spin_unlock(&inode->i_lock);

				dput(new);

				new = ERR_PTR(-ELOOP);

				pr_warn_ratelimited(
@@ -2812,7 +2812,6 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry) 
			} else {

				__d_move(new, dentry, false);

				write_sequnlock(&rename_lock);

				spin_unlock(&inode->i_lock);

				security_d_instantiate(new, inode);

			}

			iput(inode);
@@ -2926,6 +2925,13 @@ restart: 


		if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {

			struct mount *parent = ACCESS_ONCE(mnt->mnt_parent);

			/* Escaped? */

			if (dentry != vfsmnt->mnt_root) {

				bptr = *buffer;

				blen = *buflen;

				error = 3;

				break;

			}

			/* Global root? */

			if (mnt != parent) {

				dentry = ACCESS_ONCE(mnt->mnt_mountpoint);

fs/drop_caches.c

+6 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused) 
{

	struct inode *inode, *toput_inode = NULL;



	spin_lock(&inode_sb_list_lock);

	spin_lock(&sb->s_inode_list_lock);

	list_for_each_entry(inode, &sb->s_inodes, i_sb_list) {

		spin_lock(&inode->i_lock);

		if ((inode->i_state & (I_FREEING|I_WILL_FREE|I_NEW)) ||
@@ -27,13 +27,15 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused) 
		}

		__iget(inode);

		spin_unlock(&inode->i_lock);

		spin_unlock(&inode_sb_list_lock);

		spin_unlock(&sb->s_inode_list_lock);



		invalidate_mapping_pages(inode->i_mapping, 0, -1);

		iput(toput_inode);

		toput_inode = inode;

		spin_lock(&inode_sb_list_lock);



		spin_lock(&sb->s_inode_list_lock);

	}

	spin_unlock(&inode_sb_list_lock);

	spin_unlock(&sb->s_inode_list_lock);

	iput(toput_inode);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE