From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 May 2009 23:32:57 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... 
X-Git-Tag: v4.13~23299
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a6aeeebf5179ea6346249d727bdb9124ce9e2d4c;hp=-c;p=mirror_ubuntu-bionic-kernel.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: destroy bdi on error
---

a6aeeebf5179ea6346249d727bdb9124ce9e2d4c
diff --combined fs/fuse/inode.c
index d1bc4d33ccbc,75ca5ac603ae..91f7c85f1ffd
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@@ -19,7 -19,6 +19,7 @@@
  #include <linux/random.h>
  #include <linux/sched.h>
  #include <linux/exportfs.h>
 +#include <linux/smp_lock.h>
  
  MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
  MODULE_DESCRIPTION("Filesystem in Userspace");
@@@ -260,9 -259,7 +260,9 @@@ struct inode *fuse_iget(struct super_bl
  
  static void fuse_umount_begin(struct super_block *sb)
  {
 +	lock_kernel();
  	fuse_abort_conn(get_fuse_conn_super(sb));
 +	unlock_kernel();
  }
  
  static void fuse_send_destroy(struct fuse_conn *fc)
@@@ -911,6 -908,7 +911,7 @@@ static int fuse_fill_super(struct super
   err_put_root:
  	dput(root_dentry);
   err_put_conn:
+ 	bdi_destroy(&fc->bdi);
  	fuse_conn_put(fc);
   err_fput:
  	fput(file);