From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Nov 2013 06:34:18 +0000 (+0900)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9bc9ccd7db1c9f043f75380b5a5b94912046a60e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

Pull vfs updates from Al Viro:
 "All kinds of stuff this time around; some more notable parts:

   - RCU'd vfsmounts handling
   - new primitives for coredump handling
   - files_lock is gone
   - Bruce's delegations handling series
   - exportfs fixes

  plus misc stuff all over the place"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (101 commits)
  ecryptfs: ->f_op is never NULL
  locks: break delegations on any attribute modification
  locks: break delegations on link
  locks: break delegations on rename
  locks: helper functions for delegation breaking
  locks: break delegations on unlink
  namei: minor vfs_unlink cleanup
  locks: implement delegations
  locks: introduce new FL_DELEG lock flag
  vfs: take i_mutex on renamed file
  vfs: rename I_MUTEX_QUOTA now that it's not used for quotas
  vfs: don't use PARENT/CHILD lock classes for non-directories
  vfs: pull ext4's double-i_mutex-locking into common code
  exportfs: fix quadratic behavior in filehandle lookup
  exportfs: better variable name
  exportfs: move most of reconnect_path to helper function
  exportfs: eliminate unused "noprogress" counter
  exportfs: stop retrying once we race with rename/remove
  exportfs: clear DISCONNECTED on all parents sooner
  exportfs: more detailed comment for path_reconnect
  ...
---

9bc9ccd7db1c9f043f75380b5a5b94912046a60e
diff --cc drivers/usb/core/file.c
index 3bdfbf88a0ae,fe0d8365411a..ea337a718cc1
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@@ -27,29 -27,21 +27,21 @@@
  static const struct file_operations *usb_minors[MAX_USB_MINORS];
  static DECLARE_RWSEM(minor_rwsem);
  
 -static int usb_open(struct inode * inode, struct file * file)
 +static int usb_open(struct inode *inode, struct file *file)
  {
- 	int minor = iminor(inode);
- 	const struct file_operations *c;
  	int err = -ENODEV;
- 	const struct file_operations *old_fops, *new_fops = NULL;
+ 	const struct file_operations *new_fops;
  
  	down_read(&minor_rwsem);
- 	c = usb_minors[minor];
+ 	new_fops = fops_get(usb_minors[iminor(inode)]);
  
- 	if (!c || !(new_fops = fops_get(c)))
+ 	if (!new_fops)
  		goto done;
  
- 	old_fops = file->f_op;
- 	file->f_op = new_fops;
+ 	replace_fops(file, new_fops);
  	/* Curiouser and curiouser... NULL ->open() as "no device" ? */
  	if (file->f_op->open)
 -		err = file->f_op->open(inode,file);
 +		err = file->f_op->open(inode, file);
- 	if (err) {
- 		fops_put(file->f_op);
- 		file->f_op = fops_get(old_fops);
- 	}
- 	fops_put(old_fops);
   done:
  	up_read(&minor_rwsem);
  	return err;
diff --cc fs/nfs/unlink.c
index 0c29b1bb3936,8285de9eaad2..11d78944de79
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@@ -493,11 -493,10 +493,10 @@@ nfs_sillyrename(struct inode *dir, stru
  	unsigned long long fileid;
  	struct dentry *sdentry;
  	struct rpc_task *task;
 -	int            error = -EIO;
 +	int            error = -EBUSY;
  
- 	dfprintk(VFS, "NFS: silly-rename(%s/%s, ct=%d)\n",
- 		dentry->d_parent->d_name.name, dentry->d_name.name,
- 		d_count(dentry));
+ 	dfprintk(VFS, "NFS: silly-rename(%pd2, ct=%d)\n",
+ 		dentry, d_count(dentry));
  	nfs_inc_stats(dir, NFSIOS_SILLYRENAME);
  
  	/*