diff options
author | Jan Kara <jack@suse.cz> | 2012-06-12 10:20:47 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-31 01:45:54 -0400 |
commit | d9c95bdd53a8d9116d269c91ce3d151472e6bcd6 (patch) | |
tree | 43559cf0897c98796df34a585ffab0ca02fa2576 | |
parent | 1e8b212fe5dcee9d3dbb152d235f3c33458fb26e (diff) |
fs: Remove old freezing mechanism
Now that all users are converted, we can remove functions, variables, and
constants defined by the old freezing mechanism.
BugLink: https://bugs.launchpad.net/bugs/897421
Tested-by: Kamal Mostafa <kamal@canonical.com>
Tested-by: Peter M. Petrakis <peter.petrakis@canonical.com>
Tested-by: Dann Frazier <dann.frazier@canonical.com>
Tested-by: Massimo Morana <massimo.morana@canonical.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/super.c | 1 | ||||
-rw-r--r-- | include/linux/fs.h | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/fs/super.c b/fs/super.c index 0f64ecb7b1bf..a87dc1b1ac92 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -217,7 +217,6 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags) | |||
217 | mutex_init(&s->s_dquot.dqio_mutex); | 217 | mutex_init(&s->s_dquot.dqio_mutex); |
218 | mutex_init(&s->s_dquot.dqonoff_mutex); | 218 | mutex_init(&s->s_dquot.dqonoff_mutex); |
219 | init_rwsem(&s->s_dquot.dqptr_sem); | 219 | init_rwsem(&s->s_dquot.dqptr_sem); |
220 | init_waitqueue_head(&s->s_wait_unfrozen); | ||
221 | s->s_maxbytes = MAX_NON_LFS; | 220 | s->s_maxbytes = MAX_NON_LFS; |
222 | s->s_op = &default_op; | 221 | s->s_op = &default_op; |
223 | s->s_time_gran = 1000000000; | 222 | s->s_time_gran = 1000000000; |
diff --git a/include/linux/fs.h b/include/linux/fs.h index aefed9426b03..0f4b79be8717 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1459,7 +1459,6 @@ extern spinlock_t sb_lock; | |||
1459 | enum { | 1459 | enum { |
1460 | SB_UNFROZEN = 0, /* FS is unfrozen */ | 1460 | SB_UNFROZEN = 0, /* FS is unfrozen */ |
1461 | SB_FREEZE_WRITE = 1, /* Writes, dir ops, ioctls frozen */ | 1461 | SB_FREEZE_WRITE = 1, /* Writes, dir ops, ioctls frozen */ |
1462 | SB_FREEZE_TRANS = 2, | ||
1463 | SB_FREEZE_PAGEFAULT = 2, /* Page faults stopped as well */ | 1462 | SB_FREEZE_PAGEFAULT = 2, /* Page faults stopped as well */ |
1464 | SB_FREEZE_FS = 3, /* For internal FS use (e.g. to stop | 1463 | SB_FREEZE_FS = 3, /* For internal FS use (e.g. to stop |
1465 | * internal threads if needed) */ | 1464 | * internal threads if needed) */ |
@@ -1528,8 +1527,6 @@ struct super_block { | |||
1528 | struct hlist_node s_instances; | 1527 | struct hlist_node s_instances; |
1529 | struct quota_info s_dquot; /* Diskquota specific options */ | 1528 | struct quota_info s_dquot; /* Diskquota specific options */ |
1530 | 1529 | ||
1531 | int s_frozen; | ||
1532 | wait_queue_head_t s_wait_unfrozen; | ||
1533 | struct sb_writers s_writers; | 1530 | struct sb_writers s_writers; |
1534 | 1531 | ||
1535 | char s_id[32]; /* Informational name */ | 1532 | char s_id[32]; /* Informational name */ |
@@ -1585,8 +1582,6 @@ extern struct timespec current_fs_time(struct super_block *sb); | |||
1585 | /* | 1582 | /* |
1586 | * Snapshotting support. | 1583 | * Snapshotting support. |
1587 | */ | 1584 | */ |
1588 | /* Will go away when all users are converted */ | ||
1589 | #define vfs_check_frozen(sb, level) do { } while (0) | ||
1590 | 1585 | ||
1591 | void __sb_end_write(struct super_block *sb, int level); | 1586 | void __sb_end_write(struct super_block *sb, int level); |
1592 | int __sb_start_write(struct super_block *sb, int level, bool wait); | 1587 | int __sb_start_write(struct super_block *sb, int level, bool wait); |