diff options
author | Benjamin Herrenschmidt | 2012-09-07 01:48:59 +0200 |
---|---|---|
committer | Benjamin Herrenschmidt | 2012-09-07 01:48:59 +0200 |
commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /fs/ext3/super.c | |
parent | powerpc/kprobes: Rename opcode_t in probes.h to ppc_opcode_t (diff) | |
parent | powerpc: Don't use __put_user() in patch_instruction (diff) | |
download | kernel-qcow2-linux-fff34b3412b9401a76ba9d021db1bd91cb0e02b6.tar.gz kernel-qcow2-linux-fff34b3412b9401a76ba9d021db1bd91cb0e02b6.tar.xz kernel-qcow2-linux-fff34b3412b9401a76ba9d021db1bd91cb0e02b6.zip |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r-- | fs/ext3/super.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index ff9bcdc5b0d5..8c892e93d8e7 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -64,11 +64,6 @@ static int ext3_freeze(struct super_block *sb); /* * Wrappers for journal_start/end. - * - * The only special thing we need to do here is to make sure that all - * journal_end calls result in the superblock being marked dirty, so - * that sync() will call the filesystem's write_super callback if - * appropriate. */ handle_t *ext3_journal_start_sb(struct super_block *sb, int nblocks) { @@ -90,12 +85,6 @@ handle_t *ext3_journal_start_sb(struct super_block *sb, int nblocks) return journal_start(journal, nblocks); } -/* - * The only special thing we need to do here is to make sure that all - * journal_stop calls result in the superblock being marked dirty, so - * that sync() will call the filesystem's write_super callback if - * appropriate. - */ int __ext3_journal_stop(const char *where, handle_t *handle) { struct super_block *sb; |