9 files changed, 35 insertions, 88 deletions

diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index d91a3a0b2325..deb4a456cf83 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -156,9 +156,7 @@ static int dev_mkdir(const char *name, umode_t mode)
         if (!err)
                 /* mark as kernel-created inode */
                 dentry->d_inode->i_private = &thread;
-        dput(dentry);
-        mutex_unlock(&path.dentry->d_inode->i_mutex);
-        path_put(&path);
+        done_path_create(&path, dentry);
         return err;
 }
 
@@ -218,10 +216,7 @@ static int handle_create(const char *nodename, umode_t mode, struct device *dev)
                 /* mark as kernel-created inode */
                 dentry->d_inode->i_private = &thread;
         }
-        dput(dentry);
-
-        mutex_unlock(&path.dentry->d_inode->i_mutex);
-        path_put(&path);
+        done_path_create(&path, dentry);
         return err;
 }
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 57bf1d7ee80f..9ab24528f9b9 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -1188,7 +1188,7 @@ exit:
         kfree(buf);
         /* close file before return */
         if (fp)
-                filp_close(fp, current->files);
+                filp_close(fp, NULL);
         /* restore previous address limit */
         set_fs(old_fs);
 
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 9a60d4cd2184..f545716c666d 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 760efee23d4a..65624bca8b3a 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 fef290c38db6..e3dbd5a552ca 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);
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index 9e2100551c78..cbb5aaf3e567 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -109,46 +109,29 @@ static struct se_device *fd_create_virtdevice(
         struct se_subsystem_dev *se_dev,
         void *p)
 {
-        char *dev_p = NULL;
         struct se_device *dev;
         struct se_dev_limits dev_limits;
         struct queue_limits *limits;
         struct fd_dev *fd_dev = p;
         struct fd_host *fd_host = hba->hba_ptr;
-        mm_segment_t old_fs;
         struct file *file;
         struct inode *inode = NULL;
         int dev_flags = 0, flags, ret = -EINVAL;
 
         memset(&dev_limits, 0, sizeof(struct se_dev_limits));
 
-        old_fs = get_fs();
-        set_fs(get_ds());
-        dev_p = getname(fd_dev->fd_dev_name);
-        set_fs(old_fs);
-
-        if (IS_ERR(dev_p)) {
-                pr_err("getname(%s) failed: %lu\n",
-                        fd_dev->fd_dev_name, IS_ERR(dev_p));
-                ret = PTR_ERR(dev_p);
-                goto fail;
-        }
         /*
          * Use O_DSYNC by default instead of O_SYNC to forgo syncing
          * of pure timestamp updates.
          */
         flags = O_RDWR | O_CREAT | O_LARGEFILE | O_DSYNC;
 
-        file = filp_open(dev_p, flags, 0600);
+        file = filp_open(fd_dev->fd_dev_name, flags, 0600);
         if (IS_ERR(file)) {
-                pr_err("filp_open(%s) failed\n", dev_p);
+                pr_err("filp_open(%s) failed\n", fd_dev->fd_dev_name);
                 ret = PTR_ERR(file);
                 goto fail;
         }
-        if (!file || !file->f_dentry) {
-                pr_err("filp_open(%s) failed\n", dev_p);
-                goto fail;
-        }
         fd_dev->fd_file = file;
         /*
          * If using a block backend with this struct file, we extract
@@ -212,14 +195,12 @@ static struct se_device *fd_create_virtdevice(
                 " %llu total bytes\n", fd_host->fd_host_id, fd_dev->fd_dev_id,
                         fd_dev->fd_dev_name, fd_dev->fd_dev_size);
 
-        putname(dev_p);
         return dev;
 fail:
         if (fd_dev->fd_file) {
                 filp_close(fd_dev->fd_file, NULL);
                 fd_dev->fd_file = NULL;
         }
-        putname(dev_p);
         return ERR_PTR(ret);
 }
 
@@ -452,14 +433,11 @@ static ssize_t fd_set_configfs_dev_params(
                 token = match_token(ptr, tokens, args);
                 switch (token) {
                 case Opt_fd_dev_name:
-                        arg_p = match_strdup(&args[0]);
-                        if (!arg_p) {
-                                ret = -ENOMEM;
+                        if (match_strlcpy(fd_dev->fd_dev_name, &args[0],
+                                FD_MAX_DEV_NAME) == 0) {
+                                ret = -EINVAL;
                                 break;
                         }
-                        snprintf(fd_dev->fd_dev_name, FD_MAX_DEV_NAME,
-                                        "%s", arg_p);
-                        kfree(arg_p);
                         pr_debug("FILEIO: Referencing Path: %s\n",
                                         fd_dev->fd_dev_name);
                         fd_dev->fbd_flags |= FBDF_HAS_PATH;
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index ae8b18869b8c..8d9bcd8207c8 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -656,9 +656,8 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
         if (!(filp->f_mode & FMODE_WRITE))
                 ro = 1;
 
-        if (filp->f_path.dentry)
-                inode = filp->f_path.dentry->d_inode;
-        if (!inode || (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))) {
+        inode = filp->f_path.dentry->d_inode;
+        if ((!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))) {
                 LINFO(curlun, "invalid file type: %s\n", filename);
                 goto out;
         }
@@ -667,7 +666,7 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
          * If we can't read the file, it's no good.
          * If we can't write the file, use it read-only.
          */
-        if (!filp->f_op || !(filp->f_op->read || filp->f_op->aio_read)) {
+        if (!(filp->f_op->read || filp->f_op->aio_read)) {
                 LINFO(curlun, "file not readable: %s\n", filename);
                 goto out;
         }
@@ -712,7 +711,6 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
         if (fsg_lun_is_open(curlun))
                 fsg_lun_close(curlun);
 
-        get_file(filp);
         curlun->blksize = blksize;
         curlun->blkbits = blkbits;
         curlun->ro = ro;
@@ -720,10 +718,10 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
         curlun->file_length = size;
         curlun->num_sectors = num_sectors;
         LDBG(curlun, "open backing file: %s\n", filename);
-        rc = 0;
+        return 0;
 
 out:
-        filp_close(filp, current->files);
+        fput(filp);
         return rc;
 }
 
diff --git a/drivers/usb/gadget/u_uac1.c b/drivers/usb/gadget/u_uac1.c
index af9898982059..e0c5e88e03ed 100644
--- a/drivers/usb/gadget/u_uac1.c
+++ b/drivers/usb/gadget/u_uac1.c
@@ -275,17 +275,17 @@ static int gaudio_close_snd_dev(struct gaudio *gau)
         /* Close control device */
         snd = &gau->control;
         if (snd->filp)
-                filp_close(snd->filp, current->files);
+                filp_close(snd->filp, NULL);
 
         /* Close PCM playback device and setup substream */
         snd = &gau->playback;
         if (snd->filp)
-                filp_close(snd->filp, current->files);
+                filp_close(snd->filp, NULL);
 
         /* Close PCM capture device and setup substream */
         snd = &gau->capture;
         if (snd->filp)
-                filp_close(snd->filp, current->files);
+                filp_close(snd->filp, NULL);
 
         return 0;
 }
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 1ddeb11659d4..64cda560c488 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -104,6 +104,8 @@ static int fb_deferred_io_mkwrite(struct vm_area_struct *vma,
         deferred framebuffer IO. then if userspace touches a page
         again, we repeat the same scheme */
 
+        file_update_time(vma->vm_file);
+
         /* protect against the workqueue changing the page list */
         mutex_lock(&fbdefio->lock);