linux-next: manual merge of the vfs tree with Linus' tree

[Stephen Rothwell]

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                    s...@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;

pgpxx5or0KqdN.pgp
Description: PGP signature