projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[linux-2.6-microblaze.git]
/
fs
/
binfmt_misc.c
diff --git
a/fs/binfmt_misc.c
b/fs/binfmt_misc.c
index
6a7b730
..
34ebbc1
100644
(file)
--- a/
fs/binfmt_misc.c
+++ b/
fs/binfmt_misc.c
@@
-55,6
+55,7
@@
typedef struct {
} Node;
static DEFINE_RWLOCK(entries_lock);
} Node;
static DEFINE_RWLOCK(entries_lock);
+static struct file_system_type bm_fs_type;
static struct vfsmount *bm_mnt;
static int entry_count;
static struct vfsmount *bm_mnt;
static int entry_count;
@@
-203,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;
}
@@
-600,7
+600,7
@@
static ssize_t bm_entry_write(struct file *file, const char __user *buffer,
return count;
}
return count;
}
-static struct file_operations bm_entry_operations = {
+static
const
struct file_operations bm_entry_operations = {
.read = bm_entry_read,
.write = bm_entry_write,
};
.read = bm_entry_read,
.write = bm_entry_write,
};
@@
-638,7
+638,7
@@
static ssize_t bm_register_write(struct file *file, const char __user *buffer,
if (!inode)
goto out2;
if (!inode)
goto out2;
- err = simple_pin_fs(
"binfmt_misc"
, &bm_mnt, &entry_count);
+ err = simple_pin_fs(
&bm_fs_type
, &bm_mnt, &entry_count);
if (err) {
iput(inode);
inode = NULL;
if (err) {
iput(inode);
inode = NULL;
@@
-668,7
+668,7
@@
out:
return count;
}
return count;
}
-static struct file_operations bm_register_operations = {
+static
const
struct file_operations bm_register_operations = {
.write = bm_register_write,
};
.write = bm_register_write,
};
@@
-715,7
+715,7
@@
static ssize_t bm_status_write(struct file * file, const char __user * buffer,
return count;
}
return count;
}
-static struct file_operations bm_status_operations = {
+static
const
struct file_operations bm_status_operations = {
.read = bm_status_read,
.write = bm_status_write,
};
.read = bm_status_read,
.write = bm_status_write,
};
@@
-740,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 = {