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

Pull second vfs pile from Al Viro:
 "The stuff in there: fsfreeze deadlock fixes by Jan (essentially, the
  deadlock reproduced by xfstests 068), symlink and hardlink restriction
  patches, plus assorted cleanups and fixes.

  Note that another fsfreeze deadlock (emergency thaw one) is *not*
  dealt with - the series by Fernando conflicts a lot with Jan's, breaks
  userland ABI (FIFREEZE semantics gets changed) and trades the deadlock
  for massive vfsmount leak; this is going to be handled next cycle.
  There probably will be another pull request, but that stuff won't be
  in it."

Fix up trivial conflicts due to unrelated changes next to each other in
drivers/{staging/gdm72xx/usb_boot.c, usb/gadget/storage_common.c}

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (54 commits)
  delousing target_core_file a bit
  Documentation: Correct s_umount state for freeze_fs/unfreeze_fs
  fs: Remove old freezing mechanism
  ext2: Implement freezing
  btrfs: Convert to new freezing mechanism
  nilfs2: Convert to new freezing mechanism
  ntfs: Convert to new freezing mechanism
  fuse: Convert to new freezing mechanism
  gfs2: Convert to new freezing mechanism
  ocfs2: Convert to new freezing mechanism
  xfs: Convert to new freezing code
  ext4: Convert to new freezing mechanism
  fs: Protect write paths by sb_start_write - sb_end_write
  fs: Skip atime update on frozen filesystem
  fs: Add freezing handling to mnt_want_write() / mnt_drop_write()
  fs: Improve filesystem freezing handling
  switch the protection of percpu_counter list to spinlock
  nfsd: Push mnt_want_write() outside of i_mutex
  btrfs: Push mnt_want_write() outside of i_mutex
  fat: Push mnt_want_write() outside of i_mutex
  ...

3 files changed, 17 insertions, 43 deletions

diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 9a60d4cd218..f545716c666 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -157,12 +157,7 @@ static int create_worker_threads(struct bcm_mini_adapter *psAdapter)
 
 static struct file *open_firmware_file(struct bcm_mini_adapter *Adapter, const char *path)
 {
-        struct file *flp = NULL;
-        mm_segment_t oldfs;
-        oldfs = get_fs();
-        set_fs(get_ds());
-        flp = filp_open(path, O_RDONLY, S_IRWXU);
-        set_fs(oldfs);
+        struct file *flp = filp_open(path, O_RDONLY, S_IRWXU);
         if (IS_ERR(flp)) {
                 pr_err(DRV_NAME "Unable To Open File %s, err %ld", path, PTR_ERR(flp));
                 flp = NULL;
@@ -183,14 +178,12 @@ static int BcmFileDownload(struct bcm_mini_adapter *Adapter, const char *path, u
 {
         int errorno = 0;
         struct file *flp = NULL;
-        mm_segment_t oldfs;
         struct timeval tv = {0};
 
         flp = open_firmware_file(Adapter, path);
         if (!flp) {
-                errorno = -ENOENT;
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Unable to Open %s\n", path);
-                goto exit_download;
+                return -ENOENT;
         }
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Opened file is = %s and length =0x%lx to be downloaded at =0x%x", path, (unsigned long)flp->f_dentry->d_inode->i_size, loc);
         do_gettimeofday(&tv);
@@ -201,10 +194,7 @@ static int BcmFileDownload(struct bcm_mini_adapter *Adapter, const char *path, u
                 errorno = -EIO;
                 goto exit_download;
         }
-        oldfs = get_fs();
-        set_fs(get_ds());
         vfs_llseek(flp, 0, 0);
-        set_fs(oldfs);
         if (Adapter->bcm_file_readback_from_chip(Adapter->pvInterfaceAdapter, flp, loc)) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Failed to read back firmware!");
                 errorno = -EIO;
@@ -212,12 +202,7 @@ static int BcmFileDownload(struct bcm_mini_adapter *Adapter, const char *path, u
         }
 
 exit_download:
-        oldfs = get_fs();
-        set_fs(get_ds());
-        if (flp && !(IS_ERR(flp)))
-                filp_close(flp, current->files);
-        set_fs(oldfs);
-
+        filp_close(flp, NULL);
         return errorno;
 }
 
@@ -1056,10 +1041,8 @@ OUT:
 static int bcm_parse_target_params(struct bcm_mini_adapter *Adapter)
 {
         struct file *flp = NULL;
-        mm_segment_t oldfs = {0};
         char *buff;
         int len = 0;
-        loff_t pos = 0;
 
         buff = kmalloc(BUFFER_1K, GFP_KERNEL);
         if (!buff)
@@ -1079,20 +1062,16 @@ static int bcm_parse_target_params(struct bcm_mini_adapter *Adapter)
                 Adapter->pstargetparams = NULL;
                 return -ENOENT;
         }
-        oldfs = get_fs();
-        set_fs(get_ds());
-        len = vfs_read(flp, (void __user __force *)buff, BUFFER_1K, &pos);
-        set_fs(oldfs);
+        len = kernel_read(flp, 0, buff, BUFFER_1K);
+        filp_close(flp, NULL);
 
         if (len != sizeof(STARGETPARAMS)) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Mismatch in Target Param Structure!\n");
                 kfree(buff);
                 kfree(Adapter->pstargetparams);
                 Adapter->pstargetparams = NULL;
-                filp_close(flp, current->files);
                 return -ENOENT;
         }
-        filp_close(flp, current->files);
 
         /* Check for autolink in config params */
         /*
diff --git a/drivers/staging/gdm72xx/sdio_boot.c b/drivers/staging/gdm72xx/sdio_boot.c
index 760efee23d4..65624bca8b3 100644
--- a/drivers/staging/gdm72xx/sdio_boot.c
+++ b/drivers/staging/gdm72xx/sdio_boot.c
@@ -66,9 +66,8 @@ static int download_image(struct sdio_func *func, char *img_name)
                 return -ENOENT;
         }
 
-        if (filp->f_dentry)
-                inode = filp->f_dentry->d_inode;
-        if (!inode || !S_ISREG(inode->i_mode)) {
+        inode = filp->f_dentry->d_inode;
+        if (!S_ISREG(inode->i_mode)) {
                 printk(KERN_ERR "Invalid file type: %s\n", img_name);
                 ret = -EINVAL;
                 goto out;
@@ -123,7 +122,7 @@ static int download_image(struct sdio_func *func, char *img_name)
                 pno++;
         }
 out:
-        filp_close(filp, current->files);
+        filp_close(filp, NULL);
         return ret;
 }
 
diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c
index fef290c38db..e3dbd5a552c 100644
--- a/drivers/staging/gdm72xx/usb_boot.c
+++ b/drivers/staging/gdm72xx/usb_boot.c
@@ -173,14 +173,12 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
         filp = filp_open(img_name, O_RDONLY | O_LARGEFILE, 0);
         if (IS_ERR(filp)) {
                 printk(KERN_ERR "Can't find %s.\n", img_name);
-                set_fs(fs);
                 ret = PTR_ERR(filp);
                 goto restore_fs;
         }
 
-        if (filp->f_dentry)
-                inode = filp->f_dentry->d_inode;
-        if (!inode || !S_ISREG(inode->i_mode)) {
+        inode = filp->f_dentry->d_inode;
+        if (!S_ISREG(inode->i_mode)) {
                 printk(KERN_ERR "Invalid file type: %s\n", img_name);
                 ret = -EINVAL;
                 goto out;
@@ -262,7 +260,7 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
                 ret = -EINVAL;
         }
 out:
-        filp_close(filp, current->files);
+        filp_close(filp, NULL);
 
 restore_fs:
         set_fs(fs);
@@ -322,13 +320,11 @@ static int em_download_image(struct usb_device *usbdev, char *path,
                 goto restore_fs;
         }
 
-        if (filp->f_dentry) {
-                inode = filp->f_dentry->d_inode;
-                if (!inode || !S_ISREG(inode->i_mode)) {
-                        printk(KERN_ERR "Invalid file type: %s\n", path);
-                        ret = -EINVAL;
-                        goto out;
-                }
+        inode = filp->f_dentry->d_inode;
+        if (!S_ISREG(inode->i_mode)) {
+                printk(KERN_ERR "Invalid file type: %s\n", path);
+                ret = -EINVAL;
+                goto out;
         }
 
         buf = kmalloc(DOWNLOAD_CHUCK + pad_size, GFP_KERNEL);
@@ -364,7 +360,7 @@ static int em_download_image(struct usb_device *usbdev, char *path,
                 goto out;
 
 out:
-        filp_close(filp, current->files);
+        filp_close(filp, NULL);
 
 restore_fs:
         set_fs(fs);