lkml.org 
[lkml]   [2012]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the vfs tree with Linus' tree
Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
drivers/usb/gadget/storage_common.c between commit d6e16a89578f ("usb:
gadget: mass_storage: fail fsg_store_file() early if colud not open
file") from Linus' tree and commit 20818a0caa84 ("gadgetfs: clean up")
from the vfs tree.

Context changes. I fixed it up (I think - see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/usb/gadget/storage_common.c
index ae8b188,f929432..0000000
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@@ -709,12 -706,6 +708,11 @@@ static int fsg_lun_open(struct fsg_lun
goto out;
}

+ if (fsg_lun_is_open(curlun))
+ fsg_lun_close(curlun);
+
- get_file(filp);
+ curlun->blksize = blksize;
+ curlun->blkbits = blkbits;
curlun->ro = ro;
curlun->filp = filp;
curlun->file_length = size;
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-07-30 03:21    [W:0.022 / U:0.240 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site