diff --git a/[refs] b/[refs] index ca27a751ba4f..f6e0d1b1adac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5e426e9a4a8d4ccc65a6849420d47f87c080d5d +refs/heads/master: af2eb5637b88f7b8edf295ad3880706c5c30c324 diff --git a/trunk/fs/ubifs/super.c b/trunk/fs/ubifs/super.c index cf078b5cc88c..dae1c62156c6 100644 --- a/trunk/fs/ubifs/super.c +++ b/trunk/fs/ubifs/super.c @@ -1465,12 +1465,9 @@ static int ubifs_remount_rw(struct ubifs_info *c) * commit_on_unmount - commit the journal when un-mounting. * @c: UBIFS file-system description object * - * This function is called during un-mounting and it commits the journal unless - * the "fast unmount" mode is enabled. It also avoids committing the journal if - * it contains too few data. - * - * Sometimes recovery requires the journal to be committed at least once, and - * this function takes care about this. + * This function is called during un-mounting and re-mounting, and it commits + * the journal unless the "fast unmount" mode is enabled. It also avoids + * committing the journal if it contains too few data. */ static void commit_on_unmount(struct ubifs_info *c) {