[git pull] several fixes

[git pull] several fixes

[Al Viro]

	A few regression fixes from this cycle

The following changes since commit 5e7a8ca319268a70a6c7c3c1fde5bea38e1e5539:

  Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (2019-04-01 08:28:36 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git fixes

for you to fetch changes up to 6af1c849dfb1f1d326fbdd157c9bc882b921f450:

  aio: use kmem_cache_free() instead of kfree() (2019-04-04 20:13:59 -0400)

----------------------------------------------------------------
Dan Carpenter (1):
      aio: Fix an error code in __io_submit_one()

Wei Yongjun (1):
      aio: use kmem_cache_free() instead of kfree()

YueHaibing (1):
      iov_iter: Fix build error without CONFIG_CRYPTO

 fs/aio.c       | 4 ++--
 lib/iov_iter.c | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

Re: [git pull] several fixes

[pr-tracker-bot]

The pull request you sent on Wed, 10 Apr 2019 00:12:03 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/972acfb49446b30a3533ceb5682bf8350c786bc8

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

[git pull] several fixes

[Al Viro]

Several bugfixes (all of them -stable fodder).  Alexey's one deals with
double mutex_lock() in UFS (apparently, nobody has tried to test "ufs: sb mutex
merge + mutex_destroy" on something like file creation/removal on ufs -
it's a 100%-guaranteed deadlock).  Mine deal with two kinds of umount bugs,
in umount propagation and in handling of automounted submounts, both
resulting in bogus transient EBUSY from umount.  Please, pull from the
usual place:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus

Shortlog:
Al Viro (2):
      get rid of propagate_umount() mistakenly treating slaves as busy.
      fix EBUSY on umount() from MNT_SHRINKABLE

Alexey Khoroshilov (1):
      ufs: fix deadlocks introduced by sb mutex merge

Diffstat:
 fs/namespace.c |   10 +++++++++-
 fs/pnode.c     |    1 +
 fs/ufs/inode.c |    7 ++-----
 fs/ufs/namei.c |   14 ++++++--------
 4 files changed, 18 insertions(+), 14 deletions(-)

Re: [git pull] several fixes

[Linus Torvalds]

On Wed, Mar 16, 2011 at 1:21 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> In tree, with edited commit message...

Well, not edited enough. It still talks about "not needing".

That thing "doesn't need" a cdev_put() the same way I "don't need" to
be shot in the head.

But whatever.  Pulled.

                 Linus

Re: [git pull] several fixes

[Al Viro]

On Wed, Mar 16, 2011 at 11:49:31AM -0700, Linus Torvalds wrote:
> On Wed, Mar 16, 2011 at 11:17 AM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> >>
> >> "doesn't need" or "must not have"?
> >
> > It must not have one, otherwise refcounting will go astray.
> 
> That's what I thought. The commit message just seemed to be off.
> 
> > That cdev_put() should really be moved into f_op->release(), but that
> > would be quite a bit of work.
> 
> Yeah. Al?

In tree, with edited commit message...  Please, pull from
git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git/ for-linus
(just one commit in that branch)

Re: [git pull] several fixes

[Al Viro]

On Wed, Mar 16, 2011 at 06:17:54PM +0100, Miklos Szeredi wrote:
> On Wed, 16 Mar 2011, Al Viro wrote:
> > 	Several fixes, including the brown paperbag one for -ELOOP breakage
> > in the last commit of yesterday pull.  Please, pull from the usual place -
> > git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git/ for-linus
> 
> __fput doesn't need a cdev_put() for O_PATH handles.

Good catch, thanks.  Linus, do you want me to put that through vfs-2.6 or
would you rather apply directly?

Re: [git pull] several fixes

[Linus Torvalds]

On Wed, Mar 16, 2011 at 11:17 AM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>>
>> "doesn't need" or "must not have"?
>
> It must not have one, otherwise refcounting will go astray.

That's what I thought. The commit message just seemed to be off.

> That cdev_put() should really be moved into f_op->release(), but that
> would be quite a bit of work.

Yeah. Al?

                      Linus

Re: [git pull] several fixes

[Miklos Szeredi]

On Wed, 16 Mar 2011, Linus Torvalds wrote:
> On Wed, Mar 16, 2011 at 10:17 AM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> >
> > __fput doesn't need a cdev_put() for O_PATH handles.
> 
> "doesn't need" or "must not have"?

It must not have one, otherwise refcounting will go astray.

That cdev_put() should really be moved into f_op->release(), but that
would be quite a bit of work.

Thanks,
Miklos

Re: [git pull] several fixes

[Linus Torvalds]

On Wed, Mar 16, 2011 at 10:17 AM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>
> __fput doesn't need a cdev_put() for O_PATH handles.

"doesn't need" or "must not have"?

                      Linus

Re: [git pull] several fixes

[Miklos Szeredi]

On Wed, 16 Mar 2011, Al Viro wrote:
> 	Several fixes, including the brown paperbag one for -ELOOP breakage
> in the last commit of yesterday pull.  Please, pull from the usual place -
> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git/ for-linus

__fput doesn't need a cdev_put() for O_PATH handles.

Signed-off-by: mszeredi@suse.cz
---
 fs/file_table.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6/fs/file_table.c
===================================================================
--- linux-2.6.orig/fs/file_table.c	2011-03-16 16:13:25.000000000 +0100
+++ linux-2.6/fs/file_table.c	2011-03-16 17:50:22.000000000 +0100
@@ -246,8 +246,10 @@ static void __fput(struct file *file)
 		file->f_op->release(inode, file);
 	security_file_free(file);
 	ima_file_free(file);
-	if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL))
+	if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL &&
+		     !(file->f_mode & FMODE_PATH))) {
 		cdev_put(inode->i_cdev);
+	}
 	fops_put(file->f_op);
 	put_pid(file->f_owner.pid);
 	file_sb_list_del(file);

[git pull] several fixes

[Al Viro]

	Several fixes, including the brown paperbag one for -ELOOP breakage
in the last commit of yesterday pull.  Please, pull from the usual place -
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git/ for-linus

Shortlog:

Al Viro (1):
      fix follow_link() breakage

Christoph Hellwig (1):
      prune back iprune_sem

Stephen Rothwell (1):
      vfs: add nonconflicting values for O_PATH

Diffstat:

 arch/alpha/include/asm/fcntl.h  |    2 ++
 arch/parisc/include/asm/fcntl.h |    2 ++
 arch/sparc/include/asm/fcntl.h  |    2 ++
 fs/inode.c                      |   32 ++++++++++++++------------------
 fs/namei.c                      |    7 +++----
 5 files changed, 23 insertions(+), 22 deletions(-)