bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 14:53:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'configfs-for-linus' of git://git.infradead.org/users/hch/configfs

Browse Source 
Pull configfs updates from Christoph Hellwig:

 - A large patch from me to simplify setting up the list of default
   groups by actually implementing it as a list instead of an array.

 - a small Y2083 prep patch from Deepa Dinamani.  Probably doesn't
   matter on it's own, but it seems like he is trying to get rid of all
   CURRENT_TIME uses in file systems, which is a worthwhile goal.

* tag 'configfs-for-linus' of git://git.infradead.org/users/hch/configfs:
  configfs: switch ->default groups to a linked list
  configfs: Replace CURRENT_TIME by current_fs_time()
This commit is contained in:
Linus Torvalds
2016-03-17 16:25:46 -07:00
parent 48d10bda1f 1ae1602de0
commit 364e8dd9d6
18 changed files with 286 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/gadget/function/f_mass_storage.c
View File

@@ -3484,12 +3484,12 @@ static struct usb_function_instance *fsg_alloc_inst(void)
opts->lun0.lun = opts->common->luns[0];
opts->lun0.lun_id = 0;
config_group_init_type_name(&opts->lun0.group, "lun.0", &fsg_lun_type);
opts->default_groups[0] = &opts->lun0.group;
opts->func_inst.group.default_groups = opts->default_groups;
config_group_init_type_name(&opts->func_inst.group, "", &fsg_func_type);
config_group_init_type_name(&opts->lun0.group, "lun.0", &fsg_lun_type);
configfs_add_default_group(&opts->lun0.group, &opts->func_inst.group);
return &opts->func_inst;
release_buffers: