aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nilfs2/super.c')
-rw-r--r--fs/nilfs2/super.c46
1 files changed, 1 insertions, 45 deletions
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 70e8613a1954..ed8ec5718ae6 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -67,7 +67,6 @@ MODULE_DESCRIPTION("A New Implementation of the Log-structured Filesystem "
67 "(NILFS)"); 67 "(NILFS)");
68MODULE_LICENSE("GPL"); 68MODULE_LICENSE("GPL");
69 69
70static void nilfs_write_super(struct super_block *sb);
71static int nilfs_remount(struct super_block *sb, int *flags, char *data); 70static int nilfs_remount(struct super_block *sb, int *flags, char *data);
72 71
73/** 72/**
@@ -335,49 +334,6 @@ static void nilfs_put_super(struct super_block *sb)
335 unlock_kernel(); 334 unlock_kernel();
336} 335}
337 336
338/**
339 * nilfs_write_super - write super block(s) of NILFS
340 * @sb: super_block
341 *
342 * nilfs_write_super() gets a fs-dependent lock, writes super block(s), and
343 * clears s_dirt. This function is called in the section protected by
344 * lock_super().
345 *
346 * The s_dirt flag is managed by each filesystem and we protect it by ns_sem
347 * of the struct the_nilfs. Lock order must be as follows:
348 *
349 * 1. lock_super()
350 * 2. down_write(&nilfs->ns_sem)
351 *
352 * Inside NILFS, locking ns_sem is enough to protect s_dirt and the buffer
353 * of the super block (nilfs->ns_sbp[]).
354 *
355 * In most cases, VFS functions call lock_super() before calling these
356 * methods. So we must be careful not to bring on deadlocks when using
357 * lock_super(); see generic_shutdown_super(), write_super(), and so on.
358 *
359 * Note that order of lock_kernel() and lock_super() depends on contexts
360 * of VFS. We should also note that lock_kernel() can be used in its
361 * protective section and only the outermost one has an effect.
362 */
363static void nilfs_write_super(struct super_block *sb)
364{
365 struct nilfs_sb_info *sbi = NILFS_SB(sb);
366 struct the_nilfs *nilfs = sbi->s_nilfs;
367
368 down_write(&nilfs->ns_sem);
369 if (!(sb->s_flags & MS_RDONLY)) {
370 if (!nilfs_discontinued(nilfs) &&
371 !nilfs_sb_need_update(nilfs)) {
372 up_write(&nilfs->ns_sem);
373 return;
374 }
375 nilfs_commit_super(sbi, nilfs_altsb_need_update(nilfs));
376 }
377 sb->s_dirt = 0;
378 up_write(&nilfs->ns_sem);
379}
380
381static int nilfs_sync_fs(struct super_block *sb, int wait) 337static int nilfs_sync_fs(struct super_block *sb, int wait)
382{ 338{
383 struct nilfs_sb_info *sbi = NILFS_SB(sb); 339 struct nilfs_sb_info *sbi = NILFS_SB(sb);
@@ -558,7 +514,7 @@ static struct super_operations nilfs_sops = {
558 /* .drop_inode = nilfs_drop_inode, */ 514 /* .drop_inode = nilfs_drop_inode, */
559 .delete_inode = nilfs_delete_inode, 515 .delete_inode = nilfs_delete_inode,
560 .put_super = nilfs_put_super, 516 .put_super = nilfs_put_super,
561 .write_super = nilfs_write_super, 517 /* .write_super = nilfs_write_super, */
562 .sync_fs = nilfs_sync_fs, 518 .sync_fs = nilfs_sync_fs,
563 /* .write_super_lockfs */ 519 /* .write_super_lockfs */
564 /* .unlockfs */ 520 /* .unlockfs */