diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 12:28:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 12:28:32 -0700 |
| commit | 7214dd4ea9048d2031e14fc552980cecd6573a9e (patch) | |
| tree | 18c9ba52d252d29fcfe7d73d9c78205b285f91d0 /include/linux/fs.h | |
| parent | 19e8a2f875a56009c0ce30389964aca452a85510 (diff) | |
| parent | 08fdc8a0138afaf324296a342f32ad26ec465e43 (diff) | |
| download | linux-stable-7214dd4ea9048d2031e14fc552980cecd6573a9e.tar.gz linux-stable-7214dd4ea9048d2031e14fc552980cecd6573a9e.tar.bz2 linux-stable-7214dd4ea9048d2031e14fc552980cecd6573a9e.zip | |
Merge branch 'work.thaw' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs thaw updates from Al Viro:
"An ancient series that has fallen through the cracks in the previous
cycle"
* 'work.thaw' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
buffer.c: call thaw_super during emergency thaw
vfs: factor sb iteration out of do_emergency_remount
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 5d93995743b5..760d8da1b6c7 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2445,6 +2445,7 @@ extern int sync_blockdev(struct block_device *bdev); extern void kill_bdev(struct block_device *); extern struct super_block *freeze_bdev(struct block_device *); extern void emergency_thaw_all(void); +extern void emergency_thaw_bdev(struct super_block *sb); extern int thaw_bdev(struct block_device *bdev, struct super_block *sb); extern int fsync_bdev(struct block_device *); @@ -2470,6 +2471,11 @@ static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb) return 0; } +static inline int emergency_thaw_bdev(struct super_block *sb) +{ + return 0; +} + static inline void iterate_bdevs(void (*f)(struct block_device *, void *), void *arg) { } |