diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 21:12:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 21:12:39 -0700 |
| commit | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (patch) | |
| tree | bf68721fb65b64392177f498a9ba61ef027b2b3d /include/linux | |
| parent | 90ec7819737d42a0ad1c2df1ff56016facae3c6e (diff) | |
| parent | 01afaf61983d08ed1c9e5e8f2fcf4f40e9008033 (diff) | |
| download | blackbird-op-linux-7f0d384cafabfbb56663ee6944c18fc0450fc5d6.tar.gz blackbird-op-linux-7f0d384cafabfbb56663ee6944c18fc0450fc5d6.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
Minix: Clean up left over label
fix truncate inode time modification breakage
fix setattr error handling in sysfs, configfs
fcntl: return -EFAULT if copy_to_user fails
wrong type for 'magic' argument in simple_fill_super()
fix the deadlock in qib_fs
mqueue doesn't need make_bad_inode()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 3428393942a6..471e1ff5079a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2388,7 +2388,7 @@ extern const struct file_operations simple_dir_operations; extern const struct inode_operations simple_dir_inode_operations; struct tree_descr { char *name; const struct file_operations *ops; int mode; }; struct dentry *d_alloc_name(struct dentry *, const char *); -extern int simple_fill_super(struct super_block *, int, struct tree_descr *); +extern int simple_fill_super(struct super_block *, unsigned long, struct tree_descr *); extern int simple_pin_fs(struct file_system_type *, struct vfsmount **mount, int *count); extern void simple_release_fs(struct vfsmount **mount, int *count); |
