git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
usb
/
gadget
/
file_storage.c
diff --git
a/drivers/usb/gadget/file_storage.c
b/drivers/usb/gadget/file_storage.c
index
8d7f1e8
..
6f88747
100644
(file)
--- a/
drivers/usb/gadget/file_storage.c
+++ b/
drivers/usb/gadget/file_storage.c
@@
-221,6
+221,7
@@
#undef VERBOSE
#undef DUMP_MSGS
#undef VERBOSE
#undef DUMP_MSGS
+#include <linux/config.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/uaccess.h>
@@
-1905,6
+1906,7
@@
static int fsync_sub(struct lun *curlun)
inode = filp->f_dentry->d_inode;
mutex_lock(&inode->i_mutex);
inode = filp->f_dentry->d_inode;
mutex_lock(&inode->i_mutex);
+ current->flags |= PF_SYNCWRITE;
rc = filemap_fdatawrite(inode->i_mapping);
err = filp->f_op->fsync(filp, filp->f_dentry, 1);
if (!rc)
rc = filemap_fdatawrite(inode->i_mapping);
err = filp->f_op->fsync(filp, filp->f_dentry, 1);
if (!rc)
@@
-1912,6
+1914,7
@@
static int fsync_sub(struct lun *curlun)
err = filemap_fdatawait(inode->i_mapping);
if (!rc)
rc = err;
err = filemap_fdatawait(inode->i_mapping);
if (!rc)
rc = err;
+ current->flags &= ~PF_SYNCWRITE;
mutex_unlock(&inode->i_mutex);
VLDBG(curlun, "fdatasync -> %d\n", rc);
return rc;
mutex_unlock(&inode->i_mutex);
VLDBG(curlun, "fdatasync -> %d\n", rc);
return rc;
@@
-3691,7
+3694,7
@@
static void lun_release(struct device *dev)
kref_put(&fsg->ref, fsg_release);
}
kref_put(&fsg->ref, fsg_release);
}
-static void
/* __init_or_exit */
fsg_unbind(struct usb_gadget *gadget)
+static void
__exit
fsg_unbind(struct usb_gadget *gadget)
{
struct fsg_dev *fsg = get_gadget_data(gadget);
int i;
{
struct fsg_dev *fsg = get_gadget_data(gadget);
int i;