Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 147827
b: refs/heads/master
c: 876a9f7
h: refs/heads/master
i:
  147825: 8a404c9
  147823: 9302f61
v: v3
  • Loading branch information
Christoph Hellwig authored and Al Viro committed Jun 12, 2009
1 parent 4aade00 commit add5039
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 864d7c4c068f23642efe91b33be3a84afe5f71e0
refs/heads/master: 876a9f76abbcb775f8d21cbc99fa161f9e5937f1
8 changes: 0 additions & 8 deletions trunk/fs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <linux/kobject.h>
#include <linux/mutex.h>
#include <linux/file.h>
#include <linux/async.h>
#include <asm/uaccess.h>
#include "internal.h"

Expand Down Expand Up @@ -72,7 +71,6 @@ static struct super_block *alloc_super(struct file_system_type *type)
INIT_HLIST_HEAD(&s->s_anon);
INIT_LIST_HEAD(&s->s_inodes);
INIT_LIST_HEAD(&s->s_dentry_lru);
INIT_LIST_HEAD(&s->s_async_list);
init_rwsem(&s->s_umount);
mutex_init(&s->s_lock);
lockdep_set_class(&s->s_umount, &type->s_umount_key);
Expand Down Expand Up @@ -342,11 +340,6 @@ void generic_shutdown_super(struct super_block *sb)
lock_super(sb);
sb->s_flags &= ~MS_ACTIVE;

/*
* wait for asynchronous fs operations to finish before going further
*/
async_synchronize_full_domain(&sb->s_async_list);

/* bad name - it should be evict_inodes() */
invalidate_inodes(sb);
lock_kernel();
Expand Down Expand Up @@ -517,7 +510,6 @@ void sync_filesystems(int wait)
sb->s_count++;
spin_unlock(&sb_lock);
down_read(&sb->s_umount);
async_synchronize_full_domain(&sb->s_async_list);
if (sb->s_root && (wait || sb->s_dirt))
sb->s_op->sync_fs(sb, wait);
up_read(&sb->s_umount);
Expand Down
5 changes: 0 additions & 5 deletions trunk/include/linux/fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -1372,11 +1372,6 @@ struct super_block {
* generic_show_options()
*/
char *s_options;

/*
* storage for asynchronous operations
*/
struct list_head s_async_list;
};

extern struct timespec current_fs_time(struct super_block *sb);
Expand Down

0 comments on commit add5039

Please sign in to comment.