diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 18:02:55 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 18:02:55 -0800 |
| commit | 232c28fe23b88e7027c6a20965d6e78421a40532 (patch) | |
| tree | 5aa60cbba4879c913ddd8ee7a7d835c56e53ed8e /fs/internal.h | |
| parent | 54640cfe47251cd8acd7145ff86bcaf4db0e9616 (diff) | |
| parent | 56026a89e632af0cf45602dee1b2881bf21c4eba (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Change-Id: Icf907f5067fb6da5935ab0d3271df54b8d5df405
Diffstat (limited to 'fs/internal.h')
| -rw-r--r-- | fs/internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/internal.h b/fs/internal.h index 71859c4d0b41..6387b35a1c0d 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -84,9 +84,11 @@ extern struct file *get_empty_filp(void); * super.c */ extern int do_remount_sb(struct super_block *, int, void *, int); +extern int do_remount_sb2(struct vfsmount *, struct super_block *, int, + void *, int); extern bool trylock_super(struct super_block *sb); extern struct dentry *mount_fs(struct file_system_type *, - int, const char *, void *); + int, const char *, struct vfsmount *, void *); extern struct super_block *user_get_super(dev_t); /* |