projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
[firefly-linux-kernel-4.4.55.git]
/
fs
/
binfmt_misc.c
diff --git
a/fs/binfmt_misc.c
b/fs/binfmt_misc.c
index c0a909e1d290d4300ee96121c25f89cc9e12a981..34ebbc191e46ada5e8c488257e9e131b0060cac3 100644
(file)
--- a/
fs/binfmt_misc.c
+++ b/
fs/binfmt_misc.c
@@
-204,7
+204,6
@@
static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
goto _error;
if (files) {
goto _error;
if (files) {
- steal_locks(files);
put_files_struct(files);
files = NULL;
}
put_files_struct(files);
files = NULL;
}
@@
-741,10
+740,10
@@
static int bm_fill_super(struct super_block * sb, void * data, int silent)
return err;
}
return err;
}
-static
struct super_block *
bm_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
+static
int
bm_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
{
{
- return get_sb_single(fs_type, flags, data, bm_fill_super);
+ return get_sb_single(fs_type, flags, data, bm_fill_super
, mnt
);
}
static struct linux_binfmt misc_format = {
}
static struct linux_binfmt misc_format = {