From 946fc2823741c80a122a8eb1cbb8871a3c918d4d Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Tue, 12 Jun 2012 16:20:47 +0200 Subject: [PATCH] --- yaml --- r: 320996 b: refs/heads/master c: d9c95bdd53a8d9116d269c91ce3d151472e6bcd6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/super.c | 1 - trunk/include/linux/fs.h | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 666889adc007..79c657ce81c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e8b212fe5dcee9d3dbb152d235f3c33458fb26e +refs/heads/master: d9c95bdd53a8d9116d269c91ce3d151472e6bcd6 diff --git a/trunk/fs/super.c b/trunk/fs/super.c index 0f64ecb7b1bf..a87dc1b1ac92 100644 --- a/trunk/fs/super.c +++ b/trunk/fs/super.c @@ -217,7 +217,6 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags) mutex_init(&s->s_dquot.dqio_mutex); mutex_init(&s->s_dquot.dqonoff_mutex); init_rwsem(&s->s_dquot.dqptr_sem); - init_waitqueue_head(&s->s_wait_unfrozen); s->s_maxbytes = MAX_NON_LFS; s->s_op = &default_op; s->s_time_gran = 1000000000; diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index aefed9426b03..0f4b79be8717 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -1459,7 +1459,6 @@ extern spinlock_t sb_lock; enum { SB_UNFROZEN = 0, /* FS is unfrozen */ SB_FREEZE_WRITE = 1, /* Writes, dir ops, ioctls frozen */ - SB_FREEZE_TRANS = 2, SB_FREEZE_PAGEFAULT = 2, /* Page faults stopped as well */ SB_FREEZE_FS = 3, /* For internal FS use (e.g. to stop * internal threads if needed) */ @@ -1528,8 +1527,6 @@ struct super_block { struct hlist_node s_instances; struct quota_info s_dquot; /* Diskquota specific options */ - int s_frozen; - wait_queue_head_t s_wait_unfrozen; struct sb_writers s_writers; char s_id[32]; /* Informational name */ @@ -1585,8 +1582,6 @@ extern struct timespec current_fs_time(struct super_block *sb); /* * Snapshotting support. */ -/* Will go away when all users are converted */ -#define vfs_check_frozen(sb, level) do { } while (0) void __sb_end_write(struct super_block *sb, int level); int __sb_start_write(struct super_block *sb, int level, bool wait);