diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
| commit | bbe5d235ee201705530a7153b57e141cd77d818b (patch) | |
| tree | e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /fs/devfs | |
| parent | 189acaaef81b1d71aedd0d28810de24160c2e781 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/devfs')
| -rw-r--r-- | fs/devfs/base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/devfs/base.c b/fs/devfs/base.c index 52f5059c4f31..51a97f132745 100644 --- a/fs/devfs/base.c +++ b/fs/devfs/base.c | |||
| @@ -2549,11 +2549,11 @@ static int devfs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 2549 | return -EINVAL; | 2549 | return -EINVAL; |
| 2550 | } /* End Function devfs_fill_super */ | 2550 | } /* End Function devfs_fill_super */ |
| 2551 | 2551 | ||
| 2552 | static struct super_block *devfs_get_sb(struct file_system_type *fs_type, | 2552 | static int devfs_get_sb(struct file_system_type *fs_type, |
| 2553 | int flags, const char *dev_name, | 2553 | int flags, const char *dev_name, |
| 2554 | void *data) | 2554 | void *data, struct vfsmount *mnt) |
| 2555 | { | 2555 | { |
| 2556 | return get_sb_single(fs_type, flags, data, devfs_fill_super); | 2556 | return get_sb_single(fs_type, flags, data, devfs_fill_super, mnt); |
| 2557 | } | 2557 | } |
| 2558 | 2558 | ||
| 2559 | static struct file_system_type devfs_fs_type = { | 2559 | static struct file_system_type devfs_fs_type = { |