Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54753fdb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  ext3: Update documentation about ext3 quota mount options
  ext3: Don't update superblock write time when filesystem is read-only
parents 1e103d19 6dbce521

Documentation/filesystems/ext3.txt

+12 −4
Original line number Original line Diff line number Diff line
@@ -123,10 +123,18 @@ resuid=n The user ID which may use the reserved blocks. 




sb=n			Use alternate superblock at this location.

sb=n			Use alternate superblock at this location.





quota

quota			These options are ignored by the filesystem. They

noquota

noquota			are used only by quota tools to recognize volumes

grpquota

grpquota		where quota should be turned on. See documentation

usrquota

usrquota		in the quota-tools package for more details

			(http://sourceforge.net/projects/linuxquota).



jqfmt=<quota type>	These options tell filesystem details about quota

usrjquota=<file>	so that quota information can be properly updated

grpjquota=<file>	during journal replay. They replace the above

			quota options. See documentation in the quota-tools

			package for more details

			(http://sourceforge.net/projects/linuxquota).





bh		(*)	ext3 associates buffer heads to data pages to

bh		(*)	ext3 associates buffer heads to data pages to

nobh			(a) cache disk block mapping information

nobh			(a) cache disk block mapping information

fs/ext3/super.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -2321,6 +2321,17 @@ static int ext3_commit_super(struct super_block *sb, 




	if (!sbh)

	if (!sbh)

		return error;

		return error;

	/*

	 * If the file system is mounted read-only, don't update the

	 * superblock write time.  This avoids updating the superblock

	 * write time when we are mounting the root file system

	 * read/only but we need to replay the journal; at that point,

	 * for people who are east of GMT and who make their clock

	 * tick in localtime for Windows bug-for-bug compatibility,

	 * the clock is set in the future, and this will cause e2fsck

	 * to complain and force a full file system check.

	 */

	if (!(sb->s_flags & MS_RDONLY))

		es->s_wtime = cpu_to_le32(get_seconds());

		es->s_wtime = cpu_to_le32(get_seconds());

	es->s_free_blocks_count = cpu_to_le32(ext3_count_free_blocks(sb));

	es->s_free_blocks_count = cpu_to_le32(ext3_count_free_blocks(sb));

	es->s_free_inodes_count = cpu_to_le32(ext3_count_free_inodes(sb));

	es->s_free_inodes_count = cpu_to_le32(ext3_count_free_inodes(sb));