mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'master' into for-next
Sync with Linus' tree so that patches against newer codebase can be applied. Signed-off-by: Jiri Kosina <[email protected]>
This commit is contained in:
commit
9938b04472
17915 changed files with 1318191 additions and 705330 deletions
|
|
@ -415,6 +415,7 @@ void generic_shutdown_super(struct super_block *sb)
|
|||
sb->s_flags &= ~MS_ACTIVE;
|
||||
|
||||
fsnotify_unmount_inodes(sb);
|
||||
cgroup_writeback_umount();
|
||||
|
||||
evict_inodes(sb);
|
||||
|
||||
|
|
@ -1012,10 +1013,8 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,
|
|||
blkdev_put(bdev, mode);
|
||||
down_write(&s->s_umount);
|
||||
} else {
|
||||
char b[BDEVNAME_SIZE];
|
||||
|
||||
s->s_mode = mode;
|
||||
strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));
|
||||
snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev);
|
||||
sb_set_blocksize(s, block_size(bdev));
|
||||
error = fill_super(s, data, flags & MS_SILENT ? 1 : 0);
|
||||
if (error) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue