Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
  ...

13 files changed, 27 insertions, 273 deletions

diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index 7413d065906b..0f3820121e02 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -216,7 +216,7 @@ static int handle_create(const char *nodename, umode_t mode, kuid_t uid,
                 newattrs.ia_gid = gid;
                 newattrs.ia_valid = ATTR_MODE|ATTR_UID|ATTR_GID;
                 mutex_lock(&dentry->d_inode->i_mutex);
-                notify_change(dentry, &newattrs);
+                notify_change(dentry, &newattrs, NULL);
                 mutex_unlock(&dentry->d_inode->i_mutex);
 
                 /* mark as kernel-created inode */
@@ -322,9 +322,9 @@ static int handle_remove(const char *nodename, struct device *dev)
                         newattrs.ia_valid =
                                 ATTR_UID|ATTR_GID|ATTR_MODE;
                         mutex_lock(&dentry->d_inode->i_mutex);
-                        notify_change(dentry, &newattrs);
+                        notify_change(dentry, &newattrs, NULL);
                         mutex_unlock(&dentry->d_inode->i_mutex);
-                        err = vfs_unlink(parent.dentry->d_inode, dentry);
+                        err = vfs_unlink(parent.dentry->d_inode, dentry, NULL);
                         if (!err || err == -ENOENT)
                                 deleted = 1;
                 }
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 2f685f6eda48..ffa97d261cf3 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -114,7 +114,7 @@ static int misc_open(struct inode * inode, struct file * file)
         int minor = iminor(inode);
         struct miscdevice *c;
         int err = -ENODEV;
-        const struct file_operations *old_fops, *new_fops = NULL;
+        const struct file_operations *new_fops = NULL;
 
         mutex_lock(&misc_mtx);
         
@@ -141,17 +141,11 @@ static int misc_open(struct inode * inode, struct file * file)
         }
 
         err = 0;
-        old_fops = file->f_op;
-        file->f_op = new_fops;
+        replace_fops(file, new_fops);
         if (file->f_op->open) {
                 file->private_data = c;
-                err=file->f_op->open(inode,file);
-                if (err) {
-                        fops_put(file->f_op);
-                        file->f_op = fops_get(old_fops);
-                }
+                err = file->f_op->open(inode,file);
         }
-        fops_put(old_fops);
 fail:
         mutex_unlock(&misc_mtx);
         return err;
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 3f84277d7036..22d14ecbd3ec 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -148,7 +148,7 @@ int drm_stub_open(struct inode *inode, struct file *filp)
         struct drm_minor *minor;
         int minor_id = iminor(inode);
         int err = -ENODEV;
-        const struct file_operations *old_fops;
+        const struct file_operations *new_fops;
 
         DRM_DEBUG("\n");
 
@@ -163,18 +163,13 @@ int drm_stub_open(struct inode *inode, struct file *filp)
         if (drm_device_is_unplugged(dev))
                 goto out;
 
-        old_fops = filp->f_op;
-        filp->f_op = fops_get(dev->driver->fops);
-        if (filp->f_op == NULL) {
-                filp->f_op = old_fops;
+        new_fops = fops_get(dev->driver->fops);
+        if (!new_fops)
                 goto out;
-        }
-        if (filp->f_op->open && (err = filp->f_op->open(inode, filp))) {
-                fops_put(filp->f_op);
-                filp->f_op = fops_get(old_fops);
-        }
-        fops_put(old_fops);
 
+        replace_fops(filp, new_fops);
+        if (filp->f_op->open)
+                err = filp->f_op->open(inode, filp);
 out:
         mutex_unlock(&drm_global_mutex);
         return err;
diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 0b4616b87195..c0363f1b6c90 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -206,8 +206,6 @@ static int dvb_dvr_release(struct inode *inode, struct file *file)
         /* TODO */
         dvbdev->users--;
         if (dvbdev->users == 1 && dmxdev->exit == 1) {
-                fops_put(file->f_op);
-                file->f_op = NULL;
                 mutex_unlock(&dmxdev->mutex);
                 wake_up(&dvbdev->wait_queue);
         } else
@@ -1120,8 +1118,6 @@ static int dvb_demux_release(struct inode *inode, struct file *file)
         mutex_lock(&dmxdev->mutex);
         dmxdev->dvbdev->users--;
         if(dmxdev->dvbdev->users==1 && dmxdev->exit==1) {
-                fops_put(file->f_op);
-                file->f_op = NULL;
                 mutex_unlock(&dmxdev->mutex);
                 wake_up(&dmxdev->dvbdev->wait_queue);
         } else
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 401ef64f92c6..983db75de350 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -74,22 +74,15 @@ static int dvb_device_open(struct inode *inode, struct file *file)
 
         if (dvbdev && dvbdev->fops) {
                 int err = 0;
-                const struct file_operations *old_fops;
+                const struct file_operations *new_fops;
 
-                file->private_data = dvbdev;
-                old_fops = file->f_op;
-                file->f_op = fops_get(dvbdev->fops);
-                if (file->f_op == NULL) {
-                        file->f_op = old_fops;
+                new_fops = fops_get(dvbdev->fops);
+                if (!new_fops)
                         goto fail;
-                }
-                if(file->f_op->open)
+                file->private_data = dvbdev;
+                replace_fops(file, new_fops);
+                if (file->f_op->open)
                         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);
                 up_read(&minor_rwsem);
                 mutex_unlock(&dvbdev_mutex);
                 return err;
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index bdc1d15369f8..d1c7de92cfdf 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -575,7 +575,7 @@ static int alloc_device(struct nandsim *ns)
                 cfile = filp_open(cache_file, O_CREAT | O_RDWR | O_LARGEFILE, 0600);
                 if (IS_ERR(cfile))
                         return PTR_ERR(cfile);
-                if (!cfile->f_op || (!cfile->f_op->read && !cfile->f_op->aio_read)) {
+                if (!cfile->f_op->read && !cfile->f_op->aio_read) {
                         NS_ERR("alloc_device: cache file not readable\n");
                         err = -EINVAL;
                         goto err_close;
diff --git a/drivers/staging/comedi/comedi_compat32.c b/drivers/staging/comedi/comedi_compat32.c
index 2dfb06aedb15..1e9da405d833 100644
--- a/drivers/staging/comedi/comedi_compat32.c
+++ b/drivers/staging/comedi/comedi_compat32.c
@@ -86,9 +86,6 @@ struct comedi32_insnlist_struct {
 static int translated_ioctl(struct file *file, unsigned int cmd,
                             unsigned long arg)
 {
-        if (!file->f_op)
-                return -ENOTTY;
-
         if (file->f_op->unlocked_ioctl)
                 return file->f_op->unlocked_ioctl(file, cmd, arg);
 
diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
index 359c6c1ba68d..eefdb8d061b1 100644
--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@@ -105,8 +105,8 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
 #define ll_vfs_unlink(inode,entry,mnt)    vfs_unlink(inode,entry)
 #define ll_vfs_mknod(dir,entry,mnt,mode,dev)    vfs_mknod(dir,entry,mode,dev)
 #define ll_security_inode_unlink(dir,entry,mnt) security_inode_unlink(dir,entry)
-#define ll_vfs_rename(old,old_dir,mnt,new,new_dir,mnt1) \
-                vfs_rename(old,old_dir,new,new_dir)
+#define ll_vfs_rename(old,old_dir,mnt,new,new_dir,mnt1,delegated_inode) \
+                vfs_rename(old,old_dir,new,new_dir,delegated_inode)
 
 #define cfs_bio_io_error(a,b)   bio_io_error((a))
 #define cfs_bio_endio(a,b,c)    bio_endio((a),(c))
diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 34815b550e71..90bbdae824ac 100644
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -83,7 +83,7 @@ int ll_unlock(__u32 mode, struct lustre_handle *lockh)
 }
 
 
-/* called from iget5_locked->find_inode() under inode_lock spinlock */
+/* called from iget5_locked->find_inode() under inode_hash_lock spinlock */
 static int ll_test_inode(struct inode *inode, void *opaque)
 {
         struct ll_inode_info *lli = ll_i2info(inode);
diff --git a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
index 1ef06fea793b..09474e7553dd 100644
--- a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
+++ b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
@@ -224,7 +224,7 @@ int lustre_rename(struct dentry *dir, struct vfsmount *mnt,
                 GOTO(put_old, err = PTR_ERR(dchild_new));
 
         err = ll_vfs_rename(dir->d_inode, dchild_old, mnt,
-                            dir->d_inode, dchild_new, mnt);
+                            dir->d_inode, dchild_new, mnt, NULL);
 
         dput(dchild_new);
 put_old:
diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h b/drivers/staging/rtl8188eu/include/osdep_service.h
index 44f24fa31a34..36523edf6a71 100644
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -430,11 +430,6 @@ int ATOMIC_SUB_RETURN(ATOMIC_T *v, int i);
 int ATOMIC_INC_RETURN(ATOMIC_T *v);
 int ATOMIC_DEC_RETURN(ATOMIC_T *v);
 
-/* File operation APIs, just for linux now */
-int rtw_is_file_readable(char *path);
-int rtw_retrive_from_file(char *path, u8 __user *buf, u32 sz);
-int rtw_store_to_file(char *path, u8 __user *buf, u32 sz);
-
 struct rtw_netdev_priv_indicator {
         void *priv;
         u32 sizeof_priv;
diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index 5a9e9e4558aa..a1ae72772c5f 100644
--- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -356,214 +356,6 @@ inline int ATOMIC_DEC_RETURN(ATOMIC_T *v)
         return atomic_dec_return(v);
 }
 
-/* Open a file with the specific @param path, @param flag, @param mode
- * @param fpp the pointer of struct file pointer to get struct file pointer while file opening is success
- * @param path the path of the file to open
- * @param flag file operation flags, please refer to linux document
- * @param mode please refer to linux document
- * @return Linux specific error code
- */
-static int openfile(struct file **fpp, char *path, int flag, int mode)
-{
-        struct file *fp;
-
-        fp = filp_open(path, flag, mode);
-        if (IS_ERR(fp)) {
-                *fpp = NULL;
-                return PTR_ERR(fp);
-        } else {
-                *fpp = fp;
-                return 0;
-        }
-}
-
-/* Close the file with the specific @param fp
- * @param fp the pointer of struct file to close
- * @return always 0
- */
-static int closefile(struct file *fp)
-{
-        filp_close(fp, NULL);
-        return 0;
-}
-
-static int readfile(struct file *fp, char __user *buf, int len)
-{
-        int rlen = 0, sum = 0;
-
-        if (!fp->f_op || !fp->f_op->read)
-                return -EPERM;
-
-        while (sum < len) {
-                rlen = fp->f_op->read(fp, buf+sum, len-sum, &fp->f_pos);
-                if (rlen > 0)
-                        sum += rlen;
-                else if (0 != rlen)
-                        return rlen;
-                else
-                        break;
-        }
-        return  sum;
-}
-
-static int writefile(struct file *fp, char __user *buf, int len)
-{
-        int wlen = 0, sum = 0;
-
-        if (!fp->f_op || !fp->f_op->write)
-                return -EPERM;
-
-        while (sum < len) {
-                wlen = fp->f_op->write(fp, buf+sum, len-sum, &fp->f_pos);
-                if (wlen > 0)
-                        sum += wlen;
-                else if (0 != wlen)
-                        return wlen;
-                else
-                        break;
-        }
-        return sum;
-}
-
-/* Test if the specifi @param path is a file and readable
- * @param path the path of the file to test
- * @return Linux specific error code
- */
-static int isfilereadable(char *path)
-{
-        struct file *fp;
-        int ret = 0;
-        mm_segment_t oldfs;
-        char __user buf;
-
-        fp = filp_open(path, O_RDONLY, 0);
-        if (IS_ERR(fp)) {
-                ret = PTR_ERR(fp);
-        } else {
-                oldfs = get_fs(); set_fs(get_ds());
-
-                if (1 != readfile(fp, &buf, 1))
-                        ret = PTR_ERR(fp);
-
-                set_fs(oldfs);
-                filp_close(fp, NULL);
-        }
-        return ret;
-}
-
-/* Open the file with @param path and retrive the file content into
- * memory starting from @param buf for @param sz at most
- * @param path the path of the file to open and read
- * @param buf the starting address of the buffer to store file content
- * @param sz how many bytes to read at most
- * @return the byte we've read, or Linux specific error code
- */
-static int retrievefromfile(char *path, u8 __user *buf, u32 sz)
-{
-        int ret = -1;
-        mm_segment_t oldfs;
-        struct file *fp;
-
-        if (path && buf) {
-                ret = openfile(&fp, path, O_RDONLY, 0);
-                if (0 == ret) {
-                        DBG_88E("%s openfile path:%s fp =%p\n", __func__,
-                                path, fp);
-
-                        oldfs = get_fs(); set_fs(get_ds());
-                        ret = readfile(fp, buf, sz);
-                        set_fs(oldfs);
-                        closefile(fp);
-
-                        DBG_88E("%s readfile, ret:%d\n", __func__, ret);
-
-                } else {
-                        DBG_88E("%s openfile path:%s Fail, ret:%d\n", __func__,
-                                path, ret);
-                }
-        } else {
-                DBG_88E("%s NULL pointer\n", __func__);
-                ret =  -EINVAL;
-        }
-        return ret;
-}
-
-/*
-* Open the file with @param path and wirte @param sz byte of data starting from @param buf into the file
-* @param path the path of the file to open and write
-* @param buf the starting address of the data to write into file
-* @param sz how many bytes to write at most
-* @return the byte we've written, or Linux specific error code
-*/
-static int storetofile(char *path, u8 __user *buf, u32 sz)
-{
-        int ret = 0;
-        mm_segment_t oldfs;
-        struct file *fp;
-
-        if (path && buf) {
-                ret = openfile(&fp, path, O_CREAT|O_WRONLY, 0666);
-                if (0 == ret) {
-                        DBG_88E("%s openfile path:%s fp =%p\n", __func__, path, fp);
-
-                        oldfs = get_fs(); set_fs(get_ds());
-                        ret = writefile(fp, buf, sz);
-                        set_fs(oldfs);
-                        closefile(fp);
-
-                        DBG_88E("%s writefile, ret:%d\n", __func__, ret);
-
-                } else {
-                        DBG_88E("%s openfile path:%s Fail, ret:%d\n", __func__, path, ret);
-                }
-        } else {
-                DBG_88E("%s NULL pointer\n", __func__);
-                ret =  -EINVAL;
-        }
-        return ret;
-}
-
-/*
-* Test if the specifi @param path is a file and readable
-* @param path the path of the file to test
-* @return true or false
-*/
-int rtw_is_file_readable(char *path)
-{
-        if (isfilereadable(path) == 0)
-                return true;
-        else
-                return false;
-}
-
-/*
-* Open the file with @param path and retrive the file content into memory starting from @param buf for @param sz at most
-* @param path the path of the file to open and read
-* @param buf the starting address of the buffer to store file content
-* @param sz how many bytes to read at most
-* @return the byte we've read
-*/
-int rtw_retrive_from_file(char *path, u8 __user *buf, u32 sz)
-{
-        int ret = retrievefromfile(path, buf, sz);
-
-        return ret >= 0 ? ret : 0;
-}
-
-/*
- * Open the file with @param path and wirte @param sz byte of data
- * starting from @param buf into the file
- * @param path the path of the file to open and write
- * @param buf the starting address of the data to write into file
- * @param sz how many bytes to write at most
- * @return the byte we've written
- */
-int rtw_store_to_file(char *path, u8 __user *buf, u32 sz)
-{
-        int ret = storetofile(path, buf, sz);
-        return ret >= 0 ? ret : 0;
-}
-
 struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv,
                                                     void *old_priv)
 {
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 3bdfbf88a0ae..ea337a718cc1 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -29,27 +29,19 @@ static DECLARE_RWSEM(minor_rwsem);
 
 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);
-        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;