diff options
author | Christoph Hellwig <hch@infradead.org> | 2009-04-27 09:46:44 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-11 21:36:05 -0400 |
commit | 94cb993f2ee99f3a9318e7b4dbb383497c4bedea (patch) | |
tree | 71c2436a8588d253938d50e30b561dcefbb83cd7 | |
parent | b7d245de25d1f0bb75a0d04194b647762b30d3db (diff) |
ocfs2: remove ->write_super and stop maintaining ->s_dirt
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/ocfs2/super.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 5c6163f55039..3eb076ce4c07 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -126,7 +126,6 @@ static int ocfs2_get_sector(struct super_block *sb, | |||
126 | struct buffer_head **bh, | 126 | struct buffer_head **bh, |
127 | int block, | 127 | int block, |
128 | int sect_size); | 128 | int sect_size); |
129 | static void ocfs2_write_super(struct super_block *sb); | ||
130 | static struct inode *ocfs2_alloc_inode(struct super_block *sb); | 129 | static struct inode *ocfs2_alloc_inode(struct super_block *sb); |
131 | static void ocfs2_destroy_inode(struct inode *inode); | 130 | static void ocfs2_destroy_inode(struct inode *inode); |
132 | static int ocfs2_susp_quotas(struct ocfs2_super *osb, int unsuspend); | 131 | static int ocfs2_susp_quotas(struct ocfs2_super *osb, int unsuspend); |
@@ -141,7 +140,6 @@ static const struct super_operations ocfs2_sops = { | |||
141 | .clear_inode = ocfs2_clear_inode, | 140 | .clear_inode = ocfs2_clear_inode, |
142 | .delete_inode = ocfs2_delete_inode, | 141 | .delete_inode = ocfs2_delete_inode, |
143 | .sync_fs = ocfs2_sync_fs, | 142 | .sync_fs = ocfs2_sync_fs, |
144 | .write_super = ocfs2_write_super, | ||
145 | .put_super = ocfs2_put_super, | 143 | .put_super = ocfs2_put_super, |
146 | .remount_fs = ocfs2_remount, | 144 | .remount_fs = ocfs2_remount, |
147 | .show_options = ocfs2_show_options, | 145 | .show_options = ocfs2_show_options, |
@@ -365,24 +363,12 @@ static struct file_operations ocfs2_osb_debug_fops = { | |||
365 | .llseek = generic_file_llseek, | 363 | .llseek = generic_file_llseek, |
366 | }; | 364 | }; |
367 | 365 | ||
368 | /* | ||
369 | * write_super and sync_fs ripped right out of ext3. | ||
370 | */ | ||
371 | static void ocfs2_write_super(struct super_block *sb) | ||
372 | { | ||
373 | if (mutex_trylock(&sb->s_lock) != 0) | ||
374 | BUG(); | ||
375 | sb->s_dirt = 0; | ||
376 | } | ||
377 | |||
378 | static int ocfs2_sync_fs(struct super_block *sb, int wait) | 366 | static int ocfs2_sync_fs(struct super_block *sb, int wait) |
379 | { | 367 | { |
380 | int status; | 368 | int status; |
381 | tid_t target; | 369 | tid_t target; |
382 | struct ocfs2_super *osb = OCFS2_SB(sb); | 370 | struct ocfs2_super *osb = OCFS2_SB(sb); |
383 | 371 | ||
384 | sb->s_dirt = 0; | ||
385 | |||
386 | if (ocfs2_is_hard_readonly(osb)) | 372 | if (ocfs2_is_hard_readonly(osb)) |
387 | return -EROFS; | 373 | return -EROFS; |
388 | 374 | ||