2 files changed, 1 insertions, 18 deletions

diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index c4e62a6297d7..2e71368f45b4 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -1863,26 +1863,10 @@ static int do_write(struct fsg_dev *fsg)
 static int fsync_sub(struct lun *curlun)
 {
         struct file     *filp = curlun->filp;
-        struct inode    *inode;
-        int             rc, err;
 
         if (curlun->ro || !filp)
                 return 0;
-        if (!filp->f_op->fsync)
-                return -EINVAL;
-
-        inode = filp->f_path.dentry->d_inode;
-        mutex_lock(&inode->i_mutex);
-        rc = filemap_fdatawrite(inode->i_mapping);
-        err = filp->f_op->fsync(filp, filp->f_path.dentry, 1);
-        if (!rc)
-                rc = err;
-        err = filemap_fdatawait(inode->i_mapping);
-        if (!rc)
-                rc = err;
-        mutex_unlock(&inode->i_mutex);
-        VLDBG(curlun, "fdatasync -> %d\n", rc);
-        return rc;
+        return vfs_fsync(filp, filp->f_path.dentry, 1);
 }
 
 static void fsync_all(struct fsg_dev *fsg)
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index eeb26c0f88e5..317b48fdbf01 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -2001,7 +2001,6 @@ gadgetfs_make_inode (struct super_block *sb,
                 inode->i_mode = mode;
                 inode->i_uid = default_uid;
                 inode->i_gid = default_gid;
-                inode->i_blocks = 0;
                 inode->i_atime = inode->i_mtime = inode->i_ctime
                                 = CURRENT_TIME;
                 inode->i_private = data;