Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 06:34:18 +0000 (15:34 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 06:34:18 +0000 (15:34 +0900)
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
  ...

27 files changed:
1  2 
arch/arm64/kernel/signal32.c
arch/powerpc/kernel/signal_32.c
arch/s390/kernel/compat_signal.c
drivers/char/misc.c
drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
drivers/staging/rtl8188eu/os_dep/osdep_service.c
drivers/usb/core/file.c
fs/cachefiles/interface.c
fs/cifs/cifsfs.c
fs/cifs/connect.c
fs/dcache.c
fs/eventpoll.c
fs/exec.c
fs/file_table.c
fs/fuse/cuse.c
fs/fuse/fuse_i.h
fs/gfs2/inode.c
fs/namei.c
fs/nfs/dir.c
fs/nfs/nfs4file.c
fs/nfs/nfs4namespace.c
fs/nfs/nfs4proc.c
fs/nfs/unlink.c
fs/select.c
include/linux/fs.h
mm/memory.c

Simple merge
Simple merge
Simple merge
Simple merge
index 3bdfbf88a0aee73e36989c8d7adfbe3190b2e8ce,fe0d8365411aba387a37ad0ba678a785a488a2f1..ea337a718cc1ca38945d3c42e6d0f75d157083b6
  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;
Simple merge
Simple merge
Simple merge
diff --cc fs/dcache.c
Simple merge
diff --cc fs/eventpoll.c
Simple merge
diff --cc fs/exec.c
Simple merge
diff --cc fs/file_table.c
Simple merge
diff --cc fs/fuse/cuse.c
Simple merge
Simple merge
diff --cc fs/gfs2/inode.c
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc fs/nfs/dir.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/nfs/unlink.c
index 0c29b1bb393678819e33d1ef44d1602516157fab,8285de9eaad24eefc3aa7325438e21e98c625d8a..11d78944de795be25d3232b795f677fd0fe64efa
@@@ -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);
  
        /*
diff --cc fs/select.c
Simple merge
Simple merge
diff --cc mm/memory.c
Simple merge