korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-12-01 14:04:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
749f07121d
e2fsprogs/misc/tune2fs.c

3230 lines
81 KiB
C
Raw Normal View History

Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
/*
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
* tune2fs.c - Change the file system parameters on an ext2 file system
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
*
* Copyright (C) 1992, 1993, 1994 Remy Card <card@masi.ibp.fr>
* Laboratoire MASI, Institut Blaise Pascal
* Universite Pierre et Marie Curie (Paris VI)
*
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
* Copyright 1995, 1996, 1997, 1998, 1999, 2000 by Theodore Ts'o.
Many files: Checked in e2fsprogs-1.07
1997-04-30 00:17:09 +08:00
*
* %Begin-Header%
* This file may be redistributed under the terms of the GNU Public
* License.
* %End-Header%
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
*/
/*
* History:
* 93/06/01 - Creation
* 93/10/31 - Added the -c option to change the maximal mount counts
* 93/12/14 - Added -l flag to list contents of superblock
* M.J.E. Mol (marcel@duteca.et.tudelft.nl)
* F.W. ten Wolde (franky@duteca.et.tudelft.nl)
* 93/12/29 - Added the -e option to change errors behavior
* 94/02/27 - Ported to use the ext2fs library
* 94/03/06 - Added the checks interval from Uwe Ohse (uwe@tirka.gun.de)
*/
Define _XOPEN_SOURCE to 600 consistently for Solaris C99 support Solaris's header files are very picky about which C compiler can be used for SUSv3 conformance. Use of C99 is not compatible with SUSv2 (_XOPEN_SOURCE=500), and C89 is not compatible with SUSv3 (_XOPEN_SOURCE=600). Since we need some SUSv3 functions, consistently use SUSv3 so that e2fsprogs will build on Solaris using c99. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-14 03:32:37 +08:00
#define _XOPEN_SOURCE 600 /* for inclusion of strptime() */
Shorten compile commands run by the build system The DEFS line in MCONFIG had gotten so long that it exceeded 4k, and this was starting to cause some tools heartburn. It also made "make V=1" almost useless, since trying to following the individual commands run by make was lost in the noise of all of the defines. So fix this by putting the configure-generated defines in lib/config.h and the directory pathnames to lib/dirpaths.h. In addition, clean up some vestigal defines in configure.in and in the Makefiles to further shorten the cc command lines. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-09-19 05:34:37 +08:00
#include "config.h"
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
#include <fcntl.h>
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
#include <grp.h>
Many files: Checked in e2fsprogs 0.5c
1997-04-26 22:00:26 +08:00
#ifdef HAVE_GETOPT_H
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
#include <getopt.h>
Many files: badblocks.c, dumpe2fs.c, e2label.c, mke2fs.c, tune2fs.c, uuidgen.c: For platforms that don't define optarg.h, manually define optarg and optind. ChangeLog, main.c: main.c: For platforms that don't define optarg.h, manually define optarg and optind. ChangeLog, unix.c: unix.c: For platforms that don't define optarg.h, manually define optarg and optind.
2000-04-04 00:22:35 +08:00
#else
extern char *optarg;
extern int optind;
Many files: Checked in e2fsprogs 0.5c
1997-04-26 22:00:26 +08:00
#endif
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
#include <pwd.h>
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
#include <stdio.h>
Only use the test_io manager if the right environment variables are set In order to make it possible for the test_io manager to be compiled in by default, make all of the programs that might try to use it to only do so if the environment variables TEST_IO_FLAGS and TEST_IO_DEBUG are set. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-09-01 23:17:29 +08:00
#ifdef HAVE_STDLIB_H
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
#include <stdlib.h>
Only use the test_io manager if the right environment variables are set In order to make it possible for the test_io manager to be compiled in by default, make all of the programs that might try to use it to only do so if the environment variables TEST_IO_FLAGS and TEST_IO_DEBUG are set. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-09-01 23:17:29 +08:00
#endif
ext2fs: quiet compiler warnings Include ext2fsP.h in fileio.c for ext2fs_file_block_offset_too_big() declaration. Fix up the declaration to mark it extern in the header. Include <strings.h> header for strcasecmp() in tune2fs.c if available, as described in the strcasecmp(3) man page, instead of doing this indirectly by declaring _BSD_SOURCE and getting it from <string.h>. If CONFIG_QUOTA is undefined, parse_quota_opts() is unused in tune2fs.c so #ifdef it out. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 12:26:25 +08:00
#ifdef HAVE_STRINGS_H
#include <strings.h> /* for strcasecmp() */
#else
#define _BSD_SOURCE /* for inclusion of strcasecmp() via <string.h> */
Fix various clang and gcc -Wall warnings Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-19 00:45:19 +08:00
#define _DEFAULT_SOURCE /* since glibc 2.20 _BSD_SOURCE is deprecated */
ext2fs: quiet compiler warnings Include ext2fsP.h in fileio.c for ext2fs_file_block_offset_too_big() declaration. Fix up the declaration to mark it extern in the header. Include <strings.h> header for strcasecmp() in tune2fs.c if available, as described in the strcasecmp(3) man page, instead of doing this indirectly by declaring _BSD_SOURCE and getting it from <string.h>. If CONFIG_QUOTA is undefined, parse_quota_opts() is unused in tune2fs.c so #ifdef it out. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 12:26:25 +08:00
#endif
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
#include <string.h>
#include <time.h>
#include <unistd.h>
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
#include <sys/types.h>
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
#include <libgen.h>
Add "#include <limits.h>" to get PATH_MAX for mke2fs and tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-08 10:07:50 +08:00
#include <limits.h>
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
Many files: badblocks.c, chattr.c, dumpe2fs.c, e2image.c, findsuper.c, lsattr.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c: Change location of ext2_fs.h to be ext2fs/ext2_fs.h ChangeLog, Makefile.in, resize2fs.h: resize2fs.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h ChangeLog, Makefile.in, debugfs.h: debugfs.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h ChangeLog, Makefile.in, e2fsck.h, scantest.c: e2fsck.h, scantest.c: Change location of ext2_fs.h to be ext2fs/ext2_fs.h ChangeLog, Makefile.in, tst_uuid.c, uuid_time.c: tst_uuid.c, uuid_time.c: Remove unneeded #include of ext2_fs.h ChangeLog, Makefile.in, e2p.h: e2p.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h ChangeLog, Makefile.in, test_icount.c, test_rel.c: test_icount.c, test_rel.c: Change location of ext2_fs.h to be ext2fs/ext2_fs.h
2001-05-14 19:45:38 +08:00
#include "ext2fs/ext2_fs.h"
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
#include "ext2fs/ext2fs.h"
libext2fs, libe2p, misc: git rid of jfs_user.h Having multiple versions of jfs_user.h was confusing the Android build. Clean up things by removing the lib/ext2fs/jfs_user.h and misc/jfs_user.h and simplifying how we emulate the kernel infrastructure needed by journal replay code and removing the kernel-specific lines from kernel-jbd.h. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-26 07:29:34 +08:00
#include "ext2fs/kernel-jbd.h"
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
#include "et/com_err.h"
Move the check_plausibility() function from misc to lib/support The check_plausibility() function is now used all over the place, so we should move the plausible.c file to lib/support and remove the special case handling for that file that had been in the build system. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-07-13 09:55:32 +08:00
#include "support/plausible.h"
#include "support/quotaio.h"
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
#include "uuid/uuid.h"
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
#include "e2p/e2p.h"
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
#include "util.h"
Minor bug fixes in the blkid library. Convert mke2fs, fsck, and tune2fs to use the blkid library.
2003-03-02 08:29:01 +08:00
#include "blkid/blkid.h"
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
#include "../version.h"
Move the check_plausibility() function from misc to lib/support The check_plausibility() function is now used all over the place, so we should move the plausible.c file to lib/support and remove the special case handling for that file that had been in the build system. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-07-13 09:55:32 +08:00
#include "support/nls-enable.h"
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
#define QOPT_ENABLE (1)
#define QOPT_DISABLE (-1)
extern int ask_yn(const char *string, int def);
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
const char *program_name = "tune2fs";
char *device_name;
char *new_label, *new_last_mounted, *new_UUID;
char *io_options;
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
static int c_flag, C_flag, e_flag, f_flag, g_flag, i_flag, l_flag, L_flag;
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
static int m_flag, M_flag, Q_flag, r_flag, s_flag = -1, u_flag, U_flag, T_flag;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
static int I_flag;
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
static int clear_mmp;
tune2fs.8.in, tune2fs.c (parse_tune2fs_options, main): Add support for new option, -T, which allows the user to set the last checked time on the filesystem.
2001-12-26 21:58:01 +08:00
static time_t last_check_time;
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
static int print_label;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
static int max_mount_count, mount_count, mount_flags;
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 08:46:34 +08:00
static unsigned long interval;
static blk64_t reserved_blocks;
Allow fractional percentages to the -m option in mke2fs and tune2fs Allow the reserved blocks ratio to be specified in fractional percentages. Addresses-Debian-Bug: #80205 Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
2005-07-07 00:50:08 +08:00
static double reserved_ratio;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
static unsigned long resgid, resuid;
static unsigned short errors;
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
static int open_flag;
static char *features_cmd;
Add support for new feature in ext2/3 filesystems; a default mount options field in the superblock. Added the tune2fs '-o' option to set this field.
2002-10-16 05:43:43 +08:00
static char *mntopts_cmd;
Add support for setting RAID stride and strip-width via mke2fs and tune2fs This is useful for mballoc to align block allocation on the RAID stripe boundaries. Signed-off-by: Rupesh Thakare <rupesh@clusterfs.com> Signed-off-by: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-19 11:56:25 +08:00
static int stride, stripe_width;
static int stride_set, stripe_width_set;
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
static char *extended_cmd;
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
static unsigned long new_inode_size;
tune2fs: Fix mount_opts handling The extended options parsing for mount_opts was horribly buggy. Invalid mount options that had an argument would get interpreted as an extended mount options. Fix this. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-07-05 08:14:35 +08:00
static char *ext_mount_opts;
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
static int quota_enable[MAXQUOTAS];
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
static int rewrite_checksums;
tune2fs: direct user to resize2fs for 64bit conversion If the user tries to enable or disable the 64bit feature via tune2fs, tell them how to use resize2fs to effect the conversion. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:47 +08:00
static int feature_64bit;
static int fsck_requested;
tune2fs: optionally create undo file Provide the user with an option to create an undo file so that they can roll back a failed tuning operation. Previously, one would be created for inode resize if a bunch of (undocumented) conditions were met. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-05 22:41:08 +08:00
static char *undo_file;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
int journal_size, journal_flags;
char *journal_device;
tune2fs, mke2fs: add the ability to control the location of the journal Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2014-01-29 01:58:56 +08:00
static blk64_t journal_location = ~0LL;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
static struct list_head blk_move_list;
struct blk_move {
struct list_head list;
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
blk64_t old_loc;
blk64_t new_loc;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
};
tune2fs: recover the journal If the journal needs to be recovered to avoid clobbering whatever changes tune2fs makes, do so. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-02-14 06:38:17 +08:00
errcode_t ext2fs_run_ext3_journal(ext2_filsys *fs);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
static const char *please_fsck = N_("Please run e2fsck on the filesystem.\n");
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
static const char *please_dir_fsck =
N_("Please run e2fsck -D on the filesystem.\n");
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
configure.in: add --disable-libblkid option Add an option to switch between the private (in-tree) libblkid and public (in-system installed) library. The private version is still enabled by default. If --disable-libblkid is specified the findfs(8) program, which is a variant of tune2fs, is also not built or installed. Signed-off-by: Karel Zak <kzak@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-04-22 21:18:30 +08:00
#ifdef CONFIG_BUILD_FINDFS
Fix gcc -Wall nits. Fix format bug if NLS is in use. Add extra so that the info directory looks OK on OpenWall.
2002-10-14 11:56:28 +08:00
void do_findfs(int argc, char **argv);
configure.in: add --disable-libblkid option Add an option to switch between the private (in-tree) libblkid and public (in-system installed) library. The private version is still enabled by default. If --disable-libblkid is specified the findfs(8) program, which is a variant of tune2fs, is also not built or installed. Signed-off-by: Karel Zak <kzak@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-04-22 21:18:30 +08:00
#endif
Fix gcc -Wall nits. Fix format bug if NLS is in use. Add extra so that the info directory looks OK on OpenWall.
2002-10-14 11:56:28 +08:00
Fix support for configure --enable-jbd-debug We haven't used this in a while, so it's bitrotted a bit. Fix it up so that it works correctly. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-04-16 07:01:38 +08:00
#ifdef CONFIG_JBD_DEBUG /* Enabled by configure --enable-jbd-debug */
int journal_enable_debug = -1;
#endif
ChangeLog, debugfs.8.in, debugfs.c: Add a -V option which displays the current version. ChangeLog, unix.c: unix.c (e2fsck_update_progress): Remove unused variables. ChangeLog, inode.c: inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup() is called early because of a missing inode table in a block group, the current_inode counter wasn't incremented correctly. ChangeLog, tst_uuid.c: tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter. ChangeLog, test_icount.c: test_icount.c (main): Fix main() declaration so that it returns int, not void. Many files: fsck.c (ignore): Remove unused variable cp. chattr.c (fatal_error): tune2fs.c (usage): lsattr.c (usage): dumpe2fs.c (usage): badblocks.c (usage): Remove volatile from declaration. fsck.c: Change use of strdup to be string_copy, since we don't trust what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 13:11:14 +08:00
static void usage(void)
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
{
ChangeLog, tune2fs.c: tune2fs.c (main): Add support to allow HAS_JOURNAL flag to be cleared, but only if the filesystem is unmounted or mounted read-only. Changed struct ext2fs_sb to struct ext2_super, and cleaned up old code which was needed for old versions of ext2_fs.h (not needed since we're using our own version now).
2001-01-01 23:26:58 +08:00
fprintf(stderr,
Fix various man pages and usage message Thanks to pete@lyptonyx for doing a close pass editing of e2fsprogs's man pages. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-05-09 10:12:41 +08:00
_("Usage: %s [-c max_mounts_count] [-e errors_behavior] [-f] "
ChangeLog, tune2fs.c: tune2fs.c (main): Add support to allow HAS_JOURNAL flag to be cleared, but only if the filesystem is unmounted or mounted read-only. Changed struct ext2fs_sb to struct ext2_super, and cleaned up old code which was needed for old versions of ext2_fs.h (not needed since we're using our own version now).
2001-01-01 23:26:58 +08:00
"[-g group]\n"
tune2fs: Remove support for clearing the SPARSE_SUPER feature Clearing SPARSE_SUPER is dangerous; it can result in a filesystem which e2fsck can't fix easily. Since there is very few good reasons for wanting to turn this feature off, disable tune2fs's abiity to do this. Users who really want this can use debugfs. Also, deprecate the tune2fs -s option. Remove it from the man page and usage message. Addresses-Sourceforge-Bug: #1840286 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-29 10:26:01 +08:00
"\t[-i interval[d|m|w]] [-j] [-J journal_options] [-l]\n"
configure: remove support to disable quota support For the 1.43 release, quota support will be the default. It's much simpler if we don't try to make quota support optional. This was done originally because the quota feature wasn't fully tested. It is now, so we can remove this as an option. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-07-04 10:02:30 +08:00
"\t[-m reserved_blocks_percent] [-o [^]mount_options[,...]]\n"
"\t[-p mmp_update_interval] [-r reserved_blocks_count] "
"[-u user]\n"
"\t[-C mount_count] [-L volume_label] [-M last_mounted_dir]\n"
"\t[-O [^]feature[,...]] [-Q quota_options]\n"
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
"\t[-E extended-option[,...]] [-T last_check_time] "
tune2fs: optionally create undo file Provide the user with an option to create an undo file so that they can roll back a failed tuning operation. Previously, one would be created for inode resize if a bunch of (undocumented) conditions were met. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-05 22:41:08 +08:00
"[-U UUID]\n\t[-I new_inode_size] [-z undo_file] device\n"),
program_name);
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
exit(1);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
}
ChangeLog, Makefile.in, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c (main): Add a new option -O which allows the user to set and clear certain "safe" filsystem feature flags. Currently, the only ones which are supported for modification are sparse_superblock and filetype. mke2fs.c (PRS): Add new option -O which allows the user to request filesystems with specific filesystem options. By default on 2.2 and later systems, create filesystems that have both file type information and sparse superblocks.
1999-10-23 09:04:50 +08:00
static __u32 ok_features[3] = {
Add support for manipulating large_file feature in mke2fs and tune2fs Previously we just let the kernel and e2fsck do this automatically, but e2fsck will no longer automatically clear the large_file feature. It still isn't really necessary to worry about this feature flag explicitly, but some users seem to care. Addresses-Red-Hat-Bugzilla: #258381 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-28 04:01:19 +08:00
/* Compat */
mke2fs.c (main): Enable directory indexing by default. tune2fs.c (update_feature_set): Allow directory indexing flag to be set. If so, set the default hash to be TEA, and initialize the hash seed to a random value.
2002-09-23 03:37:40 +08:00
EXT3_FEATURE_COMPAT_HAS_JOURNAL |
Add support for manipulating large_file feature in mke2fs and tune2fs Previously we just let the kernel and e2fsck do this automatically, but e2fsck will no longer automatically clear the large_file feature. It still isn't really necessary to worry about this feature flag explicitly, but some users seem to care. Addresses-Red-Hat-Bugzilla: #258381 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-28 04:01:19 +08:00
EXT2_FEATURE_COMPAT_DIR_INDEX,
/* Incompat */
Merge branch 'maint' Conflicts: lib/blkid/devname.c lib/blkid/probe.c misc/mke2fs.c misc/tune2fs.c
2008-02-28 07:53:34 +08:00
EXT2_FEATURE_INCOMPAT_FILETYPE |
EXT3_FEATURE_INCOMPAT_EXTENTS |
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
EXT4_FEATURE_INCOMPAT_FLEX_BG |
tune2fs: direct user to resize2fs for 64bit conversion If the user tries to enable or disable the 64bit feature via tune2fs, tell them how to use resize2fs to effect the conversion. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:47 +08:00
EXT4_FEATURE_INCOMPAT_MMP |
tune2fs: add ability to enable the encrypt feature Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-04-06 08:42:58 +08:00
EXT4_FEATURE_INCOMPAT_64BIT |
tune2fs: allow user to turn on saving the checksum seed Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-06 01:38:52 +08:00
EXT4_FEATURE_INCOMPAT_ENCRYPT |
EXT4_FEATURE_INCOMPAT_CSUM_SEED,
Add support for manipulating large_file feature in mke2fs and tune2fs Previously we just let the kernel and e2fsck do this automatically, but e2fsck will no longer automatically clear the large_file feature. It still isn't really necessary to worry about this feature flag explicitly, but some users seem to care. Addresses-Red-Hat-Bugzilla: #258381 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-28 04:01:19 +08:00
/* R/O compat */
EXT2_FEATURE_RO_COMPAT_LARGE_FILE |
mke2fs,tune2fs: Enable huge_file, dir_nlink, and extra_isize features Also change mke2fs.conf to enable huge_file,dir_nlink,extra_isize, and uninit_bg by default for ext4 filesystems, and enable extra_isize in the library as well. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-10 22:49:59 +08:00
EXT4_FEATURE_RO_COMPAT_HUGE_FILE|
EXT4_FEATURE_RO_COMPAT_DIR_NLINK|
EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE|
Make tune2fs uninit block group aware Signed-off-by: Jose R. Santos <jrs@us.ibm.com> Signed-off-by: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-10-22 10:03:41 +08:00
EXT4_FEATURE_RO_COMPAT_GDT_CSUM |
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER |
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
EXT4_FEATURE_RO_COMPAT_QUOTA |
Add support for the read-only feature Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-02-24 01:54:15 +08:00
EXT4_FEATURE_RO_COMPAT_METADATA_CSUM |
Add project feature flag EXT4_FEATURE_RO_COMPAT_PROJECT This patch add project feature flag EXT4_FEATURE_RO_COMPAT_PROJECT. Project feature is a read-only compat feature. Thus, an ext4 file system with project feature enabled could only be read by ext4 kernel module without project feature support. Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-01 11:36:13 +08:00
EXT4_FEATURE_RO_COMPAT_READONLY |
EXT4_FEATURE_RO_COMPAT_PROJECT
ChangeLog, Makefile.in, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c (main): Add a new option -O which allows the user to set and clear certain "safe" filsystem feature flags. Currently, the only ones which are supported for modification are sparse_superblock and filetype. mke2fs.c (PRS): Add new option -O which allows the user to request filesystems with specific filesystem options. By default on 2.2 and later systems, create filesystems that have both file type information and sparse superblocks.
1999-10-23 09:04:50 +08:00
};
Teach tune2fs to use e2p_edit_feature2() to provide better error handling Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 03:27:57 +08:00
static __u32 clear_ok_features[3] = {
Add support for manipulating large_file feature in mke2fs and tune2fs Previously we just let the kernel and e2fsck do this automatically, but e2fsck will no longer automatically clear the large_file feature. It still isn't really necessary to worry about this feature flag explicitly, but some users seem to care. Addresses-Red-Hat-Bugzilla: #258381 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-28 04:01:19 +08:00
/* Compat */
Teach tune2fs to use e2p_edit_feature2() to provide better error handling Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 03:27:57 +08:00
EXT3_FEATURE_COMPAT_HAS_JOURNAL |
tune2fs: Add support to clear the resize_inode feature This requires an fsck aftwards. We don't allow setting the resize_inode feature because extensive work to tune2fs or e2fsck to safely relocate blocks is necessary in order to reserve the blocks needed by the resize inode. Addresses-Red-Hat-Bugzilla: #167816 Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 06:31:06 +08:00
EXT2_FEATURE_COMPAT_RESIZE_INODE |
Add support for manipulating large_file feature in mke2fs and tune2fs Previously we just let the kernel and e2fsck do this automatically, but e2fsck will no longer automatically clear the large_file feature. It still isn't really necessary to worry about this feature flag explicitly, but some users seem to care. Addresses-Red-Hat-Bugzilla: #258381 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-28 04:01:19 +08:00
EXT2_FEATURE_COMPAT_DIR_INDEX,
/* Incompat */
Merge branch 'maint' Conflicts: lib/blkid/devname.c lib/blkid/probe.c misc/mke2fs.c misc/tune2fs.c
2008-02-28 07:53:34 +08:00
EXT2_FEATURE_INCOMPAT_FILETYPE |
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
EXT4_FEATURE_INCOMPAT_FLEX_BG |
tune2fs: direct user to resize2fs for 64bit conversion If the user tries to enable or disable the 64bit feature via tune2fs, tell them how to use resize2fs to effect the conversion. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:47 +08:00
EXT4_FEATURE_INCOMPAT_MMP |
tune2fs: allow user to turn on saving the checksum seed Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-06 01:38:52 +08:00
EXT4_FEATURE_INCOMPAT_64BIT |
EXT4_FEATURE_INCOMPAT_CSUM_SEED,
Add support for manipulating large_file feature in mke2fs and tune2fs Previously we just let the kernel and e2fsck do this automatically, but e2fsck will no longer automatically clear the large_file feature. It still isn't really necessary to worry about this feature flag explicitly, but some users seem to care. Addresses-Red-Hat-Bugzilla: #258381 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-28 04:01:19 +08:00
/* R/O compat */
Make tune2fs uninit block group aware Signed-off-by: Jose R. Santos <jrs@us.ibm.com> Signed-off-by: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-10-22 10:03:41 +08:00
EXT2_FEATURE_RO_COMPAT_LARGE_FILE |
mke2fs,tune2fs: Enable huge_file, dir_nlink, and extra_isize features Also change mke2fs.conf to enable huge_file,dir_nlink,extra_isize, and uninit_bg by default for ext4 filesystems, and enable extra_isize in the library as well. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-10 22:49:59 +08:00
EXT4_FEATURE_RO_COMPAT_HUGE_FILE|
EXT4_FEATURE_RO_COMPAT_DIR_NLINK|
EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE|
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
EXT4_FEATURE_RO_COMPAT_GDT_CSUM |
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
EXT4_FEATURE_RO_COMPAT_QUOTA |
Add support for the read-only feature Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-02-24 01:54:15 +08:00
EXT4_FEATURE_RO_COMPAT_METADATA_CSUM |
EXT4_FEATURE_RO_COMPAT_READONLY
ChangeLog, Makefile.in, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c (main): Add a new option -O which allows the user to set and clear certain "safe" filsystem feature flags. Currently, the only ones which are supported for modification are sparse_superblock and filetype. mke2fs.c (PRS): Add new option -O which allows the user to request filesystems with specific filesystem options. By default on 2.2 and later systems, create filesystems that have both file type information and sparse superblocks.
1999-10-23 09:04:50 +08:00
};
tune2fs: update journal super block when changing UUID for fs. Using -U option you can change the UUID for fs, however it will not work for journal device, since it have a copy of this UUID inside jsb (i.e. journal super block). So copy UUID on change into that block. Here is the initial thread: http://comments.gmane.org/gmane.comp.file-systems.ext4/44532 You can reproduce this by executing following commands: $ fallocate -l100M /tmp/dev $ fallocate -l100M /tmp/journal $ sudo /sbin/losetup /dev/loop1 /tmp/dev $ sudo /sbin/losetup /dev/loop0 /tmp/journal $ mke2fs -O journal_dev /tmp/journal $ tune2fs -U da1f2ed0-60f6-aaaa-92fd-738701418523 /tmp/journal $ sudo mke2fs -t ext4 -J device=/dev/loop0 /dev/loop1 $ dumpe2fs -h /tmp/dev | fgrep UUID dumpe2fs 1.43-WIP (18-May-2014) Filesystem UUID: 8a776be9-12eb-411f-8e88-b873575ecfb6 Journal UUID: e3d02151-e776-4865-af25-aecb7291e8e5 $ sudo e2fsck /dev/vdc e2fsck 1.43-WIP (18-May-2014) External journal does not support this filesystem /dev/loop1: ********** WARNING: Filesystem still has errors ********** Reported-by: Chin Tzung Cheng <chintzung@gmail.com> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Reviewed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:24 +08:00
/**
* Try to get journal super block if any
*/
static int get_journal_sb(ext2_filsys jfs, char buf[SUPERBLOCK_SIZE])
{
int retval;
journal_superblock_t *jsb;
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (!ext2fs_has_feature_journal_dev(jfs->super)) {
tune2fs: update journal super block when changing UUID for fs. Using -U option you can change the UUID for fs, however it will not work for journal device, since it have a copy of this UUID inside jsb (i.e. journal super block). So copy UUID on change into that block. Here is the initial thread: http://comments.gmane.org/gmane.comp.file-systems.ext4/44532 You can reproduce this by executing following commands: $ fallocate -l100M /tmp/dev $ fallocate -l100M /tmp/journal $ sudo /sbin/losetup /dev/loop1 /tmp/dev $ sudo /sbin/losetup /dev/loop0 /tmp/journal $ mke2fs -O journal_dev /tmp/journal $ tune2fs -U da1f2ed0-60f6-aaaa-92fd-738701418523 /tmp/journal $ sudo mke2fs -t ext4 -J device=/dev/loop0 /dev/loop1 $ dumpe2fs -h /tmp/dev | fgrep UUID dumpe2fs 1.43-WIP (18-May-2014) Filesystem UUID: 8a776be9-12eb-411f-8e88-b873575ecfb6 Journal UUID: e3d02151-e776-4865-af25-aecb7291e8e5 $ sudo e2fsck /dev/vdc e2fsck 1.43-WIP (18-May-2014) External journal does not support this filesystem /dev/loop1: ********** WARNING: Filesystem still has errors ********** Reported-by: Chin Tzung Cheng <chintzung@gmail.com> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Reviewed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:24 +08:00
return EXT2_ET_UNSUPP_FEATURE;
}
/* Get the journal superblock */
if ((retval = io_channel_read_blk64(jfs->io,
ext2fs_journal_sb_start(jfs->blocksize), -SUPERBLOCK_SIZE, buf))) {
com_err(program_name, retval, "%s",
_("while reading journal superblock"));
return retval;
}
jsb = (journal_superblock_t *) buf;
if ((jsb->s_header.h_magic != (unsigned)ntohl(JFS_MAGIC_NUMBER)) ||
(jsb->s_header.h_blocktype != (unsigned)ntohl(JFS_SUPERBLOCK_V2))) {
fputs(_("Journal superblock not found!\n"), stderr);
return EXT2_ET_BAD_MAGIC;
}
return 0;
}
misc: quiet signed/unsigned charactr compiler warnings Quiet warnings about signed vs. unsigned character mismatch. Use __u8 for storing UUIDs instead of char to match the superblock s_uuid field. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-30 07:30:39 +08:00
static __u8 *journal_user(__u8 uuid[UUID_SIZE], __u8 s_users[JFS_USERS_SIZE],
int nr_users)
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
{
int i;
for (i = 0; i < nr_users; i++) {
if (memcmp(uuid, &s_users[i * UUID_SIZE], UUID_SIZE) == 0)
return &s_users[i * UUID_SIZE];
}
return NULL;
}
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
/*
* Remove an external journal from the filesystem
*/
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
static int remove_journal_device(ext2_filsys fs)
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
{
Fix various gcc -Wall nits. Fixed a bug in mke2fs where a bogus error message could be printed on an malloc() failure, and e2image was optimized to avoid needless system calls by using the stashed inode functions.
2001-12-17 12:23:37 +08:00
char *journal_path;
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
ext2_filsys jfs;
misc: fix alignment warnings on ARM Some temporary char buffers allocated on the stack are not properly aligned when typecast to a structure containing __u32 or __u64 types, and this can cause alignment warnings on ARM and other alignment sensitive architectures, and potential slowdowns to do fixups. Fix the buffer alignment to avoid such issues. Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=680090 Reported-by: Gordan Bobic <gordan.bobic@gmail.com> Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-23 06:40:51 +08:00
char buf[SUPERBLOCK_SIZE] __attribute__ ((aligned(8)));
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
journal_superblock_t *jsb;
int i, nr_users;
errcode_t retval;
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
int commit_remove_journal = 0;
Add --enable-test-io-debug configure option which causes e2fsck and tune2fs to use the test I/O manager. The test I/O manager has been changed to not do anything extra by default, unless the TEST_IO_FLAGS and/or TEST_IO_BLOCK environment variables are set, which controls what I/O operations are logged and a block number to watch, respectively. The log messages are sent to stderr by default, unless a filename is specified via the TEST_IO_LOGFILE environment variable.
2003-05-06 00:08:47 +08:00
io_manager io_ptr;
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
if (f_flag)
commit_remove_journal = 1; /* force removal even if error */
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
get_device_by_label.[ch], fsck.c, util.c: New interpret_spec() function in get_device_by_label.c to allow the use of UUID= or LABEL= when creating filesystems which use external journal dev (e.g. mke2fs -J device=LABEL=<journal_label>). tune2fs.c: Use superblock s_journal_uuid to locate an external journal device instead of s_journal_dev when removing it. Allow opening journal devices to set the label and UUID in the ext2 superblock. mke2fs.c, tune2fs.c: Free journal_device after use, as it is malloc'd in interpret spec.
2001-08-17 17:48:11 +08:00
uuid_unparse(fs->super->s_journal_uuid, buf);
Minor bug fixes in the blkid library. Convert mke2fs, fsck, and tune2fs to use the blkid library.
2003-03-02 08:29:01 +08:00
journal_path = blkid_get_devname(NULL, "UUID", buf);
get_device_by_label.[ch], fsck.c, util.c: New interpret_spec() function in get_device_by_label.c to allow the use of UUID= or LABEL= when creating filesystems which use external journal dev (e.g. mke2fs -J device=LABEL=<journal_label>). tune2fs.c: Use superblock s_journal_uuid to locate an external journal device instead of s_journal_dev when removing it. Allow opening journal devices to set the label and UUID in the ext2 superblock. mke2fs.c, tune2fs.c: Free journal_device after use, as it is malloc'd in interpret spec.
2001-08-17 17:48:11 +08:00
Fix various gcc -Wall nits. Fixed a bug in mke2fs where a bogus error message could be printed on an malloc() failure, and e2image was optimized to avoid needless system calls by using the stashed inode functions.
2001-12-17 12:23:37 +08:00
if (!journal_path) {
journal_path =
get_device_by_label.[ch], fsck.c, util.c: New interpret_spec() function in get_device_by_label.c to allow the use of UUID= or LABEL= when creating filesystems which use external journal dev (e.g. mke2fs -J device=LABEL=<journal_label>). tune2fs.c: Use superblock s_journal_uuid to locate an external journal device instead of s_journal_dev when removing it. Allow opening journal devices to set the label and UUID in the ext2 superblock. mke2fs.c, tune2fs.c: Free journal_device after use, as it is malloc'd in interpret spec.
2001-08-17 17:48:11 +08:00
ext2fs_find_block_device(fs->super->s_journal_dev);
Fix various gcc -Wall nits. Fixed a bug in mke2fs where a bogus error message could be printed on an malloc() failure, and e2image was optimized to avoid needless system calls by using the stashed inode functions.
2001-12-17 12:23:37 +08:00
if (!journal_path)
tune2fs: kill external journal if device not found Continue to remove the external journal device even if the device cannot be found. Add a test to verify that the journal device/UUID are actually removed from the superblock. It isn't possible to use a real journal device for testing without loopback devices and such (it must be a block device) and this would invite complexity and failures in the regression test. Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-09-25 01:17:05 +08:00
goto no_valid_journal;
get_device_by_label.[ch], fsck.c, util.c: New interpret_spec() function in get_device_by_label.c to allow the use of UUID= or LABEL= when creating filesystems which use external journal dev (e.g. mke2fs -J device=LABEL=<journal_label>). tune2fs.c: Use superblock s_journal_uuid to locate an external journal device instead of s_journal_dev when removing it. Allow opening journal devices to set the label and UUID in the ext2 superblock. mke2fs.c, tune2fs.c: Free journal_device after use, as it is malloc'd in interpret spec.
2001-08-17 17:48:11 +08:00
}
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
Add --enable-test-io-debug configure option which causes e2fsck and tune2fs to use the test I/O manager. The test I/O manager has been changed to not do anything extra by default, unless the TEST_IO_FLAGS and/or TEST_IO_BLOCK environment variables are set, which controls what I/O operations are logged and a block number to watch, respectively. The log messages are sent to stderr by default, unless a filename is specified via the TEST_IO_LOGFILE environment variable.
2003-05-06 00:08:47 +08:00
#ifdef CONFIG_TESTIO_DEBUG
Only use the test_io manager if the right environment variables are set In order to make it possible for the test_io manager to be compiled in by default, make all of the programs that might try to use it to only do so if the environment variables TEST_IO_FLAGS and TEST_IO_DEBUG are set. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-09-01 23:17:29 +08:00
if (getenv("TEST_IO_FLAGS") || getenv("TEST_IO_BLOCK")) {
io_ptr = test_io_manager;
test_io_backing_manager = unix_io_manager;
} else
Add --enable-test-io-debug configure option which causes e2fsck and tune2fs to use the test I/O manager. The test I/O manager has been changed to not do anything extra by default, unless the TEST_IO_FLAGS and/or TEST_IO_BLOCK environment variables are set, which controls what I/O operations are logged and a block number to watch, respectively. The log messages are sent to stderr by default, unless a filename is specified via the TEST_IO_LOGFILE environment variable.
2003-05-06 00:08:47 +08:00
#endif
Only use the test_io manager if the right environment variables are set In order to make it possible for the test_io manager to be compiled in by default, make all of the programs that might try to use it to only do so if the environment variables TEST_IO_FLAGS and TEST_IO_DEBUG are set. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-09-01 23:17:29 +08:00
io_ptr = unix_io_manager;
Fix various gcc -Wall nits. Fixed a bug in mke2fs where a bogus error message could be printed on an malloc() failure, and e2image was optimized to avoid needless system calls by using the stashed inode functions.
2001-12-17 12:23:37 +08:00
retval = ext2fs_open(journal_path, EXT2_FLAG_RW|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
EXT2_FLAG_JOURNAL_DEV_OK, 0,
Add --enable-test-io-debug configure option which causes e2fsck and tune2fs to use the test I/O manager. The test I/O manager has been changed to not do anything extra by default, unless the TEST_IO_FLAGS and/or TEST_IO_BLOCK environment variables are set, which controls what I/O operations are logged and a block number to watch, respectively. The log messages are sent to stderr by default, unless a filename is specified via the TEST_IO_LOGFILE environment variable.
2003-05-06 00:08:47 +08:00
fs->blocksize, io_ptr, &jfs);
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
if (retval) {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
com_err(program_name, retval, "%s",
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
_("while trying to open external journal"));
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
goto no_valid_journal;
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
}
tune2fs: update journal super block when changing UUID for fs. Using -U option you can change the UUID for fs, however it will not work for journal device, since it have a copy of this UUID inside jsb (i.e. journal super block). So copy UUID on change into that block. Here is the initial thread: http://comments.gmane.org/gmane.comp.file-systems.ext4/44532 You can reproduce this by executing following commands: $ fallocate -l100M /tmp/dev $ fallocate -l100M /tmp/journal $ sudo /sbin/losetup /dev/loop1 /tmp/dev $ sudo /sbin/losetup /dev/loop0 /tmp/journal $ mke2fs -O journal_dev /tmp/journal $ tune2fs -U da1f2ed0-60f6-aaaa-92fd-738701418523 /tmp/journal $ sudo mke2fs -t ext4 -J device=/dev/loop0 /dev/loop1 $ dumpe2fs -h /tmp/dev | fgrep UUID dumpe2fs 1.43-WIP (18-May-2014) Filesystem UUID: 8a776be9-12eb-411f-8e88-b873575ecfb6 Journal UUID: e3d02151-e776-4865-af25-aecb7291e8e5 $ sudo e2fsck /dev/vdc e2fsck 1.43-WIP (18-May-2014) External journal does not support this filesystem /dev/loop1: ********** WARNING: Filesystem still has errors ********** Reported-by: Chin Tzung Cheng <chintzung@gmail.com> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Reviewed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:24 +08:00
if ((retval = get_journal_sb(jfs, buf))) {
if (retval == EXT2_ET_UNSUPP_FEATURE)
fprintf(stderr, _("%s is not a journal device.\n"),
journal_path);
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
goto no_valid_journal;
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
}
jsb = (journal_superblock_t *) buf;
/* Find the filesystem UUID */
nr_users = ntohl(jsb->s_nr_users);
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
if (!journal_user(fs->super->s_uuid, jsb->s_users, nr_users)) {
Remove trailing whitespace for the entire source tree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-28 11:07:54 +08:00
fputs(_("Filesystem's UUID not found on journal device.\n"),
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
stderr);
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
commit_remove_journal = 1;
goto no_valid_journal;
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
}
nr_users--;
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
for (i = 0; i < nr_users; i++)
tune2fs: miscellaneous whitespace fixups Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-09-25 01:25:34 +08:00
memcpy(&jsb->s_users[i * 16], &jsb->s_users[(i + 1) * 16], 16);
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
jsb->s_nr_users = htonl(nr_users);
/* Write back the journal superblock */
misc: quiet signed/unsigned charactr compiler warnings Quiet warnings about signed vs. unsigned character mismatch. Use __u8 for storing UUIDs instead of char to match the superblock s_uuid field. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-30 07:30:39 +08:00
retval = io_channel_write_blk64(jfs->io,
ext2fs_journal_sb_start(fs->blocksize),
-SUPERBLOCK_SIZE, buf);
if (retval) {
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
com_err(program_name, retval,
"while writing journal superblock.");
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
goto no_valid_journal;
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
}
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
commit_remove_journal = 1;
no_valid_journal:
if (commit_remove_journal == 0) {
tune2fs: kill external journal if device not found Continue to remove the external journal device even if the device cannot be found. Add a test to verify that the journal device/UUID are actually removed from the superblock. It isn't possible to use a real journal device for testing without loopback devices and such (it must be a block device) and this would invite complexity and failures in the regression test. Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-09-25 01:17:05 +08:00
fputs(_("Cannot locate journal device. It was NOT removed\n"
"Use -f option to remove missing journal device.\n"),
stderr);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 1;
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
}
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
fs->super->s_journal_dev = 0;
misc: zero s_jnl_blocks when adding journal online or removing external journal Erase s_jnl_blocks when removing an external journal, or adding an internal journal online. We can't add the backup for the internal journal because we have no good way to get the indirect block or ETB addresses, so the best we can do is hope that the user runs e2fsck, which will correct that. We are motivated to erase during external journal removal to state emphatically that there's no journal. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: thomas_reardon@hotmail.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-19 09:24:26 +08:00
memset(fs->super->s_jnl_blocks, 0, sizeof(fs->super->s_jnl_blocks));
Minor bug fixes in the blkid library. Convert mke2fs, fsck, and tune2fs to use the blkid library.
2003-03-02 08:29:01 +08:00
uuid_clear(fs->super->s_journal_uuid);
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
ext2fs_mark_super_dirty(fs);
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
fputs(_("Journal removed\n"), stdout);
Fix various gcc -Wall nits. Fixed a bug in mke2fs where a bogus error message could be printed on an malloc() failure, and e2image was optimized to avoid needless system calls by using the stashed inode functions.
2001-12-17 12:23:37 +08:00
free(journal_path);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 0;
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
}
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
/* Helper function for remove_journal_inode */
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
static int release_blocks_proc(ext2_filsys fs, blk64_t *blocknr,
e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
blk64_t ref_block EXT2FS_ATTR((unused)),
int ref_offset EXT2FS_ATTR((unused)),
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
void *private EXT2FS_ATTR((unused)))
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
{
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
blk64_t block;
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
int group;
block = *blocknr;
Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-23 09:15:30 +08:00
ext2fs_unmark_block_bitmap2(fs->block_map, block);
Convert ext2fs_group_of_blk() to ext2fs_group_of_blk2() Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 08:50:15 +08:00
group = ext2fs_group_of_blk2(fs, block);
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
ext2fs_bg_free_blocks_count_set(fs, group, ext2fs_bg_free_blocks_count(fs, group) + 1);
Make tune2fs uninit block group aware Signed-off-by: Jose R. Santos <jrs@us.ibm.com> Signed-off-by: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-10-22 10:03:41 +08:00
ext2fs_group_desc_csum_set(fs, group);
Fix superblock field s_blocks_count for bigalloc file systems Treat the s_blocks_count field in the superblock as a free block count (instead of the number of free clusters) for bigalloc file systems. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-06-16 13:38:43 +08:00
ext2fs_free_blocks_count_add(fs->super, EXT2FS_CLUSTER_RATIO(fs));
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
return 0;
}
/*
* Remove the journal inode from the filesystem
*/
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
static errcode_t remove_journal_inode(ext2_filsys fs)
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
{
struct ext2_inode inode;
errcode_t retval;
ino_t ino = fs->super->s_journal_inum;
Remove trailing whitespace for the entire source tree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-28 11:07:54 +08:00
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
retval = ext2fs_read_inode(fs, ino, &inode);
if (retval) {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
com_err(program_name, retval, "%s",
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
_("while reading journal inode"));
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return retval;
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
}
if (ino == EXT2_JOURNAL_INO) {
retval = ext2fs_read_bitmaps(fs);
if (retval) {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
com_err(program_name, retval, "%s",
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
_("while reading bitmaps"));
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return retval;
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
}
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
retval = ext2fs_block_iterate3(fs, ino,
BLOCK_FLAG_READ_ONLY, NULL,
release_blocks_proc, NULL);
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
if (retval) {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
com_err(program_name, retval, "%s",
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
_("while clearing journal inode"));
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return retval;
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
}
memset(&inode, 0, sizeof(inode));
ext2fs_mark_bb_dirty(fs);
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
} else
inode.i_flags &= ~EXT2_IMMUTABLE_FL;
retval = ext2fs_write_inode(fs, ino, &inode);
if (retval) {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
com_err(program_name, retval, "%s",
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
_("while writing journal inode"));
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return retval;
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
}
fs->super->s_journal_inum = 0;
misc: zero s_jnl_blocks when removing internal journal When we're removing the internal journal (broken journal, turning it off, or adding an external journal), zero s_jnl_blocks so that they can't be picked up by accident later. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Cc: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-09 07:12:35 +08:00
memset(fs->super->s_jnl_blocks, 0, sizeof(fs->super->s_jnl_blocks));
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
ext2fs_mark_super_dirty(fs);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 0;
tune2fs.c (update_feature_set, remove_journal_inode): If removing an in-filesystem journal, clear out the journal inode and update the filesystem accounting structures so we don't have to run e2fsck to clean up after ourselves
2001-08-01 00:03:23 +08:00
}
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
Add support for new feature in ext2/3 filesystems; a default mount options field in the superblock. Added the tune2fs '-o' option to set this field.
2002-10-16 05:43:43 +08:00
/*
* Update the default mount options
*/
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
static int update_mntopts(ext2_filsys fs, char *mntopts)
Add support for new feature in ext2/3 filesystems; a default mount options field in the superblock. Added the tune2fs '-o' option to set this field.
2002-10-16 05:43:43 +08:00
{
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
struct ext2_super_block *sb = fs->super;
Add support for new feature in ext2/3 filesystems; a default mount options field in the superblock. Added the tune2fs '-o' option to set this field.
2002-10-16 05:43:43 +08:00
if (e2p_edit_mntopts(mntopts, &sb->s_default_mount_opts, ~0)) {
fprintf(stderr, _("Invalid mount option set: %s\n"),
mntopts);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 1;
Add support for new feature in ext2/3 filesystems; a default mount options field in the superblock. Added the tune2fs '-o' option to set this field.
2002-10-16 05:43:43 +08:00
}
ext2fs_mark_super_dirty(fs);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 0;
Add support for new feature in ext2/3 filesystems; a default mount options field in the superblock. Added the tune2fs '-o' option to set this field.
2002-10-16 05:43:43 +08:00
}
tune2fs: confirm dangerous operations Give admins a short amount of time to confirm that they want to proceed with a dangerous operation. Refuse to perform the op unless the filesystem is freshly checked. Cc: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-02-14 06:38:11 +08:00
static void check_fsck_needed(ext2_filsys fs, const char *prompt)
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
{
tune2fs: confirm dangerous operations Give admins a short amount of time to confirm that they want to proceed with a dangerous operation. Refuse to perform the op unless the filesystem is freshly checked. Cc: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-02-14 06:38:11 +08:00
/* Refuse to modify anything but a freshly checked valid filesystem. */
if (!(fs->super->s_state & EXT2_VALID_FS) ||
(fs->super->s_state & EXT2_ERROR_FS) ||
(fs->super->s_lastcheck < fs->super->s_mtime)) {
printf("\n%s\n", _(please_fsck));
if (mount_flags & EXT2_MF_READONLY)
printf("%s", _("(and reboot afterwards!)\n"));
exit(1);
}
/* Give the admin a few seconds to bail out of a dangerous op. */
if (!getenv("TUNE2FS_FORCE_PROMPT") && (!isatty(0) || !isatty(1)))
return;
puts(prompt);
proceed_question(5);
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
}
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
static void request_dir_fsck_afterwards(ext2_filsys fs)
{
static int requested;
if (requested++)
return;
tune2fs: direct user to resize2fs for 64bit conversion If the user tries to enable or disable the 64bit feature via tune2fs, tell them how to use resize2fs to effect the conversion. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:47 +08:00
fsck_requested++;
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
fs->super->s_state &= ~EXT2_VALID_FS;
printf("\n%s\n", _(please_dir_fsck));
if (mount_flags & EXT2_MF_READONLY)
misc: fix compile warnings on master branch Fix compile warnings found on the master branch when using LLVM. - Add missing format string when using the libintl _() macro - include <limits.h> header to get PATH_MAX definition - fix format vs. variable mismatches - add header block for create_inode.c file - remove use of bzero(), use ext2fs_get_memzero() instead Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-05-28 01:14:18 +08:00
printf("%s", _("(and reboot afterwards!)\n"));
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
}
tune2fs: Enable uninit_bg to be set without requiring an fsck Allow the uninit_bg feature to be set without requiring an fsck. The first full fsck will require scanning all of the inode table blocks, but subsequent fsck's will be fast. This allows flexibility over requiring a full fsck after setting this feature, which is what tune2fs previously mandated. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-05-20 00:14:39 +08:00
static void request_fsck_afterwards(ext2_filsys fs)
{
static int requested = 0;
if (requested++)
return;
tune2fs: direct user to resize2fs for 64bit conversion If the user tries to enable or disable the 64bit feature via tune2fs, tell them how to use resize2fs to effect the conversion. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:47 +08:00
fsck_requested++;
tune2fs: Enable uninit_bg to be set without requiring an fsck Allow the uninit_bg feature to be set without requiring an fsck. The first full fsck will require scanning all of the inode table blocks, but subsequent fsck's will be fast. This allows flexibility over requiring a full fsck after setting this feature, which is what tune2fs previously mandated. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-05-20 00:14:39 +08:00
fs->super->s_state &= ~EXT2_VALID_FS;
printf("\n%s\n", _(please_fsck));
if (mount_flags & EXT2_MF_READONLY)
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
printf("%s", _("(and reboot afterwards!)\n"));
tune2fs: Enable uninit_bg to be set without requiring an fsck Allow the uninit_bg feature to be set without requiring an fsck. The first full fsck will require scanning all of the inode table blocks, but subsequent fsck's will be fast. This allows flexibility over requiring a full fsck after setting this feature, which is what tune2fs previously mandated. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-05-20 00:14:39 +08:00
}
tune2fs: direct user to resize2fs for 64bit conversion If the user tries to enable or disable the 64bit feature via tune2fs, tell them how to use resize2fs to effect the conversion. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:47 +08:00
static void convert_64bit(ext2_filsys fs, int direction)
{
if (!direction)
return;
/*
* Is resize2fs going to demand a fsck run? Might as well tell the
* user now.
*/
if (!fsck_requested &&
((fs->super->s_state & EXT2_ERROR_FS) ||
!(fs->super->s_state & EXT2_VALID_FS) ||
fs->super->s_lastcheck < fs->super->s_mtime))
request_fsck_afterwards(fs);
if (fsck_requested)
fprintf(stderr, _("After running e2fsck, please run `resize2fs %s %s"),
direction > 0 ? "-b" : "-s", fs->device_name);
else
fprintf(stderr, _("Please run `resize2fs %s %s"),
direction > 0 ? "-b" : "-s", fs->device_name);
tune2fs: optionally create undo file Provide the user with an option to create an undo file so that they can roll back a failed tuning operation. Previously, one would be created for inode resize if a bunch of (undocumented) conditions were met. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-05 22:41:08 +08:00
if (undo_file)
fprintf(stderr, _(" -z \"%s\""), undo_file);
tune2fs: direct user to resize2fs for 64bit conversion If the user tries to enable or disable the 64bit feature via tune2fs, tell them how to use resize2fs to effect the conversion. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:47 +08:00
if (direction > 0)
fprintf(stderr, _("' to enable 64-bit mode.\n"));
else
fprintf(stderr, _("' to disable 64-bit mode.\n"));
}
tune2fs: enable extent tree checksums Add to tune2fs the ability to recalculate extent tree checksums when altering the metadata checksum feature flag. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 07:16:04 +08:00
/* Rewrite extents */
static errcode_t rewrite_extents(ext2_filsys fs, ext2_ino_t ino,
struct ext2_inode *inode)
{
ext2_extent_handle_t handle;
struct ext2fs_extent extent;
errcode_t errcode;
tune2fs: speed up rewriting extent tree when enabling metadata_csum When enabling checksums, tune2fs naively rewrites every extent in the entire tree! This is unnecessary since we only need to rewrite each extent tree block; therefore, only rewrite the extent if it's the first one in an internal extent tree block. Also, don't bother iterating the extent tree when clearing checksums. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-11-05 00:52:03 +08:00
struct ext2_extent_info info;
tune2fs: enable extent tree checksums Add to tune2fs the ability to recalculate extent tree checksums when altering the metadata checksum feature flag. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 07:16:04 +08:00
tune2fs: speed up rewriting extent tree when enabling metadata_csum When enabling checksums, tune2fs naively rewrites every extent in the entire tree! This is unnecessary since we only need to rewrite each extent tree block; therefore, only rewrite the extent if it's the first one in an internal extent tree block. Also, don't bother iterating the extent tree when clearing checksums. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-11-05 00:52:03 +08:00
if (!(inode->i_flags & EXT4_EXTENTS_FL) ||
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
!ext2fs_has_feature_metadata_csum(fs->super))
tune2fs: enable extent tree checksums Add to tune2fs the ability to recalculate extent tree checksums when altering the metadata checksum feature flag. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 07:16:04 +08:00
return 0;
errcode = ext2fs_extent_open(fs, ino, &handle);
if (errcode)
return errcode;
tune2fs: speed up rewriting extent tree when enabling metadata_csum When enabling checksums, tune2fs naively rewrites every extent in the entire tree! This is unnecessary since we only need to rewrite each extent tree block; therefore, only rewrite the extent if it's the first one in an internal extent tree block. Also, don't bother iterating the extent tree when clearing checksums. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-11-05 00:52:03 +08:00
errcode = ext2fs_extent_get(handle, EXT2_EXTENT_ROOT, &extent);
if (errcode)
goto out;
do {
errcode = ext2fs_extent_get_info(handle, &info);
tune2fs: enable extent tree checksums Add to tune2fs the ability to recalculate extent tree checksums when altering the metadata checksum feature flag. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 07:16:04 +08:00
if (errcode)
break;
tune2fs: speed up rewriting extent tree when enabling metadata_csum When enabling checksums, tune2fs naively rewrites every extent in the entire tree! This is unnecessary since we only need to rewrite each extent tree block; therefore, only rewrite the extent if it's the first one in an internal extent tree block. Also, don't bother iterating the extent tree when clearing checksums. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-11-05 00:52:03 +08:00
/*
* If this is the first extent in an extent block that we
* haven't visited, rewrite the extent to force the ETB
* checksum to be rewritten.
*/
if (info.curr_entry == 1 && info.curr_level != 0 &&
!(extent.e_flags & EXT2_EXTENT_FLAGS_SECOND_VISIT)) {
errcode = ext2fs_extent_replace(handle, 0, &extent);
if (errcode)
break;
tune2fs: enable extent tree checksums Add to tune2fs the ability to recalculate extent tree checksums when altering the metadata checksum feature flag. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 07:16:04 +08:00
}
tune2fs: speed up rewriting extent tree when enabling metadata_csum When enabling checksums, tune2fs naively rewrites every extent in the entire tree! This is unnecessary since we only need to rewrite each extent tree block; therefore, only rewrite the extent if it's the first one in an internal extent tree block. Also, don't bother iterating the extent tree when clearing checksums. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-11-05 00:52:03 +08:00
/* Skip to the end of a block of leaf nodes */
if (extent.e_flags & EXT2_EXTENT_FLAGS_LEAF) {
errcode = ext2fs_extent_get(handle,
EXT2_EXTENT_LAST_SIB,
&extent);
if (errcode)
break;
}
errcode = ext2fs_extent_get(handle, EXT2_EXTENT_NEXT, &extent);
} while (errcode == 0);
tune2fs: enable extent tree checksums Add to tune2fs the ability to recalculate extent tree checksums when altering the metadata checksum feature flag. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 07:16:04 +08:00
tune2fs: speed up rewriting extent tree when enabling metadata_csum When enabling checksums, tune2fs naively rewrites every extent in the entire tree! This is unnecessary since we only need to rewrite each extent tree block; therefore, only rewrite the extent if it's the first one in an internal extent tree block. Also, don't bother iterating the extent tree when clearing checksums. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-11-05 00:52:03 +08:00
out:
tune2fs: enable extent tree checksums Add to tune2fs the ability to recalculate extent tree checksums when altering the metadata checksum feature flag. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 07:16:04 +08:00
/* Ok if we run off the end */
if (errcode == EXT2_ET_EXTENT_NO_NEXT)
errcode = 0;
tune2fs: speed up rewriting extent tree when enabling metadata_csum When enabling checksums, tune2fs naively rewrites every extent in the entire tree! This is unnecessary since we only need to rewrite each extent tree block; therefore, only rewrite the extent if it's the first one in an internal extent tree block. Also, don't bother iterating the extent tree when clearing checksums. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-11-05 00:52:03 +08:00
ext2fs_extent_free(handle);
tune2fs: enable extent tree checksums Add to tune2fs the ability to recalculate extent tree checksums when altering the metadata checksum feature flag. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 07:16:04 +08:00
return errcode;
}
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
/*
* Rewrite directory blocks with checksums
*/
struct rewrite_dir_context {
char *buf;
errcode_t errcode;
ext2_ino_t dir;
int is_htree;
};
static int rewrite_dir_block(ext2_filsys fs,
blk64_t *blocknr,
misc: fix gcc -Wall nits [For 1.43 branch] Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-05-20 21:21:34 +08:00
e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
blk64_t ref_block EXT2FS_ATTR((unused)),
int ref_offset EXT2FS_ATTR((unused)),
void *priv_data)
{
struct ext2_dx_countlimit *dcl = NULL;
struct rewrite_dir_context *ctx = priv_data;
int dcl_offset, changed = 0;
ctx->errcode = ext2fs_read_dir_block4(fs, *blocknr, ctx->buf, 0,
ctx->dir);
if (ctx->errcode)
return BLOCK_ABORT;
/* if htree node... */
if (ctx->is_htree)
ext2fs_get_dx_countlimit(fs, (struct ext2_dir_entry *)ctx->buf,
&dcl, &dcl_offset);
if (dcl) {
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (!ext2fs_has_feature_metadata_csum(fs->super)) {
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
/* Ensure limit is the max size */
int max_entries = (fs->blocksize - dcl_offset) /
sizeof(struct ext2_dx_entry);
if (ext2fs_le16_to_cpu(dcl->limit) != max_entries) {
changed = 1;
dcl->limit = ext2fs_cpu_to_le16(max_entries);
}
} else {
/* If htree block is full then rebuild the dir */
if (ext2fs_le16_to_cpu(dcl->count) ==
ext2fs_le16_to_cpu(dcl->limit)) {
request_dir_fsck_afterwards(fs);
return 0;
}
/*
* Ensure dcl->limit is small enough to leave room for
* the checksum tail.
*/
int max_entries = (fs->blocksize - (dcl_offset +
sizeof(struct ext2_dx_tail))) /
sizeof(struct ext2_dx_entry);
if (ext2fs_le16_to_cpu(dcl->limit) != max_entries)
dcl->limit = ext2fs_cpu_to_le16(max_entries);
/* Always rewrite checksum */
changed = 1;
}
} else {
unsigned int rec_len, name_size;
char *top = ctx->buf + fs->blocksize;
struct ext2_dir_entry *de = (struct ext2_dir_entry *)ctx->buf;
struct ext2_dir_entry *last_de = NULL, *penultimate_de = NULL;
/* Find last and penultimate dirent */
while ((char *)de < top) {
penultimate_de = last_de;
last_de = de;
ctx->errcode = ext2fs_get_rec_len(fs, de, &rec_len);
if (!ctx->errcode && !rec_len)
ctx->errcode = EXT2_ET_DIR_CORRUPTED;
if (ctx->errcode)
return BLOCK_ABORT;
misc: fix gcc -Wall nits [For 1.43 branch] Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-05-20 21:21:34 +08:00
de = (struct ext2_dir_entry *)(((char *)de) + rec_len);
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
}
ctx->errcode = ext2fs_get_rec_len(fs, last_de, &rec_len);
if (ctx->errcode)
return BLOCK_ABORT;
libext2fs: provide functions to safely access name_len and file_type Accessing name_len (and file_type) in ext4_dir_entry structure is somewhat problematic because on big endian architecture we need to now whether we are really dealing with ext4_dir_entry (which has u16 name_len which needs byte swapping) or ext4_dir_entry_2 (which has u8 name_len which must not be byte swapped). Currently the code is somewhat surprising and name_len is always treated as u16 and byte swapped (flag EXT2_DIRBLOCK_V2_STRUCT isn't ever used) and then masking of name_len is used to access real name_len or file_type. Doing things this way in applications using libext2fs is unexpected to say the least (more natural is to type struct ext4_dir_entry * to struct ext4_dir_entry_2 * but that gives wrong results on big endian architectures. So provide helper functions that give endian-safe access to these fields. Also convert users in e2fsprogs to use these functions. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-06-08 23:26:14 +08:00
name_size = ext2fs_dirent_name_len(last_de);
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (!ext2fs_has_feature_metadata_csum(fs->super)) {
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
if (!penultimate_de)
return 0;
if (last_de->inode ||
name_size ||
rec_len != sizeof(struct ext2_dir_entry_tail))
return 0;
/*
* The last dirent is unused and the right length to
* have stored a checksum. Erase it.
*/
ctx->errcode = ext2fs_get_rec_len(fs, penultimate_de,
&rec_len);
if (!rec_len)
ctx->errcode = EXT2_ET_DIR_CORRUPTED;
if (ctx->errcode)
return BLOCK_ABORT;
ext2fs_set_rec_len(fs, rec_len +
sizeof(struct ext2_dir_entry_tail),
penultimate_de);
changed = 1;
} else {
misc: fix gcc -Wall nits [For 1.43 branch] Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-05-20 21:21:34 +08:00
unsigned csum_size = sizeof(struct ext2_dir_entry_tail);
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
struct ext2_dir_entry_tail *t;
/*
* If the last dirent looks like the tail, just update
* the checksum.
*/
if (!last_de->inode &&
rec_len == csum_size) {
t = (struct ext2_dir_entry_tail *)last_de;
t->det_reserved_name_len =
EXT2_DIR_NAME_LEN_CSUM;
changed = 1;
goto out;
}
if (name_size & 3)
name_size = (name_size & ~3) + 4;
/* If there's not enough space for the tail, e2fsck */
if (rec_len <= (8 + name_size + csum_size)) {
request_dir_fsck_afterwards(fs);
return 0;
}
/* Shorten that last de and insert the tail */
ext2fs_set_rec_len(fs, rec_len - csum_size, last_de);
t = EXT2_DIRENT_TAIL(ctx->buf, fs->blocksize);
ext2fs_initialize_dirent_tail(fs, t);
/* Always update checksum */
changed = 1;
}
}
out:
if (!changed)
return 0;
ctx->errcode = ext2fs_write_dir_block4(fs, *blocknr, ctx->buf,
0, ctx->dir);
if (ctx->errcode)
return BLOCK_ABORT;
return 0;
}
misc: fix gcc -Wall nits [For 1.43 branch] Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-05-20 21:21:34 +08:00
static errcode_t rewrite_directory(ext2_filsys fs, ext2_ino_t dir,
struct ext2_inode *inode)
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
{
errcode_t retval;
struct rewrite_dir_context ctx;
retval = ext2fs_get_mem(fs->blocksize, &ctx.buf);
if (retval)
return retval;
ctx.is_htree = (inode->i_flags & EXT2_INDEX_FL);
ctx.dir = dir;
ctx.errcode = 0;
retval = ext2fs_block_iterate3(fs, dir, BLOCK_FLAG_READ_ONLY |
BLOCK_FLAG_DATA_ONLY,
0, rewrite_dir_block, &ctx);
ext2fs_free_mem(&ctx.buf);
if (retval)
return retval;
return ctx.errcode;
}
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
/*
* Forcibly set checksums in all inodes.
*/
static void rewrite_inodes(ext2_filsys fs)
{
int length = EXT2_INODE_SIZE(fs->super);
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
struct ext2_inode *inode, *zero;
tune2fs: rewrite extended attribute block checksums When enabling metadata checksums, rewrite separate extended attribute blocks. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:44 +08:00
char *ea_buf;
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
ext2_inode_scan scan;
errcode_t retval;
ext2_ino_t ino;
tune2fs: rewrite extended attribute block checksums When enabling metadata checksums, rewrite separate extended attribute blocks. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:44 +08:00
blk64_t file_acl_block;
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
int inode_dirty;
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
if (fs->super->s_creator_os != EXT2_OS_LINUX)
return;
retval = ext2fs_open_inode_scan(fs, 0, &scan);
if (retval) {
com_err("set_csum", retval, "while opening inode scan");
exit(1);
}
retval = ext2fs_get_mem(length, &inode);
if (retval) {
com_err("set_csum", retval, "while allocating memory");
exit(1);
}
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
retval = ext2fs_get_memzero(length, &zero);
if (retval) {
com_err("set_csum", retval, "while allocating memory");
exit(1);
}
tune2fs: rewrite extended attribute block checksums When enabling metadata checksums, rewrite separate extended attribute blocks. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:44 +08:00
retval = ext2fs_get_mem(fs->blocksize, &ea_buf);
if (retval) {
com_err("set_csum", retval, "while allocating memory");
exit(1);
}
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
do {
retval = ext2fs_get_next_inode_full(scan, &ino, inode, length);
if (retval) {
com_err("set_csum", retval, "while getting next inode");
exit(1);
}
if (!ino)
break;
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
if (ext2fs_test_inode_bitmap2(fs->inode_map, ino)) {
inode_dirty = 1;
} else {
if (memcmp(inode, zero, length) != 0) {
memset(inode, 0, length);
inode_dirty = 1;
} else {
inode_dirty = 0;
}
}
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
if (inode_dirty) {
retval = ext2fs_write_inode_full(fs, ino, inode,
length);
if (retval) {
com_err("set_csum", retval, "while writing "
"inode");
exit(1);
}
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
}
tune2fs: enable extent tree checksums Add to tune2fs the ability to recalculate extent tree checksums when altering the metadata checksum feature flag. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 07:16:04 +08:00
retval = rewrite_extents(fs, ino, inode);
if (retval) {
com_err("rewrite_extents", retval,
"while rewriting extents");
exit(1);
}
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
libext2fs: handle inline_data in block iterator function After applied this commit (a7f4c635), we have banned to traverse blocks for an inode which has inline data because no block belongs to it. But before calling this function, we need to check inline data flag. This commit add a sanity check ext2fs_inode_has_valid_blocks2() to fix them except that ext2fs_expand_dir because it will be fixed by another patch. Meanwhile in this commit it fixes a bug that when we kill a file we could leak an inode. Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2014-03-03 13:27:48 +08:00
if (LINUX_S_ISDIR(inode->i_mode) &&
ext2fs_inode_has_valid_blocks2(fs, inode)) {
tune2fs: rebuild and checksum directories when necessary Since all the metadata checksums depend on the fs UUID, tune2fs must be able to rewrite the checksums of _all_ metadata. It's not that hard to add in the bits to resize the directory block structures at the same time. [ Merged in fix from Zheng Liu where ctx.errcode wasn't getting cleared in rewrite_directory(). ] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:35 +08:00
retval = rewrite_directory(fs, ino, inode);
if (retval) {
com_err("rewrite_directory", retval,
"while rewriting directories");
exit(1);
}
}
tune2fs: rewrite extended attribute block checksums When enabling metadata checksums, rewrite separate extended attribute blocks. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:44 +08:00
file_acl_block = ext2fs_file_acl_block(fs, inode);
if (!file_acl_block)
continue;
retval = ext2fs_read_ext_attr3(fs, file_acl_block, ea_buf, ino);
if (retval) {
com_err("rewrite_eablock", retval,
"while rewriting extended attribute");
exit(1);
}
retval = ext2fs_write_ext_attr3(fs, file_acl_block, ea_buf,
ino);
if (retval) {
com_err("rewrite_eablock", retval,
"while rewriting extended attribute");
exit(1);
}
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
} while (ino);
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
ext2fs_free_mem(&zero);
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
ext2fs_free_mem(&inode);
tune2fs: rewrite extended attribute block checksums When enabling metadata checksums, rewrite separate extended attribute blocks. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:44 +08:00
ext2fs_free_mem(&ea_buf);
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
ext2fs_close_inode_scan(scan);
}
static void rewrite_metadata_checksums(ext2_filsys fs)
{
tune2fs: add error checking to ext2fs_read_bitmaps() calls Addresses-Coverity-Id: #1153628 Addresses-Coverity-Id: #1153629 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-01-11 12:04:57 +08:00
errcode_t retval;
Merge branch 'maint' into next Conflicts: e2fsck/pass1b.c e2fsck/rehash.c lib/ext2fs/crc32c.c lib/ext2fs/gen_bitmap64.c misc/tune2fs.c
2013-05-20 09:45:16 +08:00
dgrp_t i;
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS;
ext2fs_init_csum_seed(fs);
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
for (i = 0; i < fs->group_desc_count; i++)
ext2fs_group_desc_csum_set(fs, i);
tune2fs: add error checking to ext2fs_read_bitmaps() calls Addresses-Coverity-Id: #1153628 Addresses-Coverity-Id: #1153629 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-01-11 12:04:57 +08:00
retval = ext2fs_read_bitmaps(fs);
if (retval) {
com_err("rewrite_metadata_checksums", retval,
"while reading bitmaps");
exit(1);
}
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
rewrite_inodes(fs);
tune2fs: rewrite inode bitmap checksums When toggling metadata_csum, mark the inode bitmap dirty so that they are written out with new checksums. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:58:04 +08:00
ext2fs_mark_ib_dirty(fs);
tune2fs: rewrite block bitmap checksums When toggling metadata_csum, mark the block bitmap dirty so that it gets written with new checksums. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 07:12:04 +08:00
ext2fs_mark_bb_dirty(fs);
tune2fs: force MMP update when changing metadata_csum flag When changing the metadata_csum flag, always force out a new MMP block. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
ext2fs_mmp_update2(fs, 1);
tune2fs: rewrite inode bitmap checksums When toggling metadata_csum, mark the inode bitmap dirty so that they are written out with new checksums. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:58:04 +08:00
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS;
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (ext2fs_has_feature_metadata_csum(fs->super))
tune2fs: store checksum algorithm type in superblock Actually records the checksum algorithm type in the superblock when enabling checksumming. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:44 +08:00
fs->super->s_checksum_type = EXT2_CRC32C_CHKSUM;
else
fs->super->s_checksum_type = 0;
ext2fs_mark_super_dirty(fs);
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
}
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
static void enable_uninit_bg(ext2_filsys fs)
{
struct ext2_group_desc *gd;
Merge branch 'maint' into next Conflicts: e2fsck/pass1b.c e2fsck/rehash.c lib/ext2fs/crc32c.c lib/ext2fs/gen_bitmap64.c misc/tune2fs.c
2013-05-20 09:45:16 +08:00
dgrp_t i;
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
for (i = 0; i < fs->group_desc_count; i++) {
gd = ext2fs_group_desc(fs, fs->group_desc, i);
gd->bg_itable_unused = 0;
gd->bg_flags = EXT2_BG_INODE_ZEROED;
ext2fs_group_desc_csum_set(fs, i);
}
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
}
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
static errcode_t zero_empty_inodes(ext2_filsys fs)
{
int length = EXT2_INODE_SIZE(fs->super);
misc: fix gcc warnings Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-08-25 00:16:23 +08:00
struct ext2_inode *inode = NULL;
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
ext2_inode_scan scan;
errcode_t retval;
ext2_ino_t ino;
retval = ext2fs_open_inode_scan(fs, 0, &scan);
if (retval)
goto out;
retval = ext2fs_get_mem(length, &inode);
if (retval)
goto out;
do {
retval = ext2fs_get_next_inode_full(scan, &ino, inode, length);
if (retval)
goto out;
if (!ino)
break;
if (!ext2fs_test_inode_bitmap2(fs->inode_map, ino)) {
memset(inode, 0, length);
retval = ext2fs_write_inode_full(fs, ino, inode,
length);
if (retval)
goto out;
}
} while (1);
out:
ext2fs_free_mem(&inode);
ext2fs_close_inode_scan(scan);
return retval;
}
tune2fs: always check disable_uninit_bg() return code Enhance disable_uninit_bg() to return error codes -- if something goes wrong, we want to flag the FS as needing a fsck and exit. Mr. Reardon discovered that tune2fs -O ^metadata_csum on a FS with a corrupt bitmap would leave the FS in a weird state. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-12 03:43:33 +08:00
static errcode_t disable_uninit_bg(ext2_filsys fs, __u32 csum_feature_flag)
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
{
struct ext2_group_desc *gd;
Merge branch 'maint' into next Conflicts: e2fsck/pass1b.c e2fsck/rehash.c lib/ext2fs/crc32c.c lib/ext2fs/gen_bitmap64.c misc/tune2fs.c
2013-05-20 09:45:16 +08:00
dgrp_t i;
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
errcode_t retval;
blk64_t b, c, d;
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
/* Load bitmaps to ensure that the uninit ones get written out */
fs->super->s_feature_ro_compat |= csum_feature_flag;
tune2fs: add error checking to ext2fs_read_bitmaps() calls Addresses-Coverity-Id: #1153628 Addresses-Coverity-Id: #1153629 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-01-11 12:04:57 +08:00
retval = ext2fs_read_bitmaps(fs);
tune2fs: always check disable_uninit_bg() return code Enhance disable_uninit_bg() to return error codes -- if something goes wrong, we want to flag the FS as needing a fsck and exit. Mr. Reardon discovered that tune2fs -O ^metadata_csum on a FS with a corrupt bitmap would leave the FS in a weird state. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-12 03:43:33 +08:00
fs->super->s_feature_ro_compat &= ~csum_feature_flag;
tune2fs: add error checking to ext2fs_read_bitmaps() calls Addresses-Coverity-Id: #1153628 Addresses-Coverity-Id: #1153629 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-01-11 12:04:57 +08:00
if (retval) {
com_err("disable_uninit_bg", retval,
"while reading bitmaps");
tune2fs: always check disable_uninit_bg() return code Enhance disable_uninit_bg() to return error codes -- if something goes wrong, we want to flag the FS as needing a fsck and exit. Mr. Reardon discovered that tune2fs -O ^metadata_csum on a FS with a corrupt bitmap would leave the FS in a weird state. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-12 03:43:33 +08:00
request_fsck_afterwards(fs);
return retval;
tune2fs: add error checking to ext2fs_read_bitmaps() calls Addresses-Coverity-Id: #1153628 Addresses-Coverity-Id: #1153629 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-01-11 12:04:57 +08:00
}
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
ext2fs_mark_ib_dirty(fs);
ext2fs_mark_bb_dirty(fs);
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
/* If we're only turning off uninit_bg, zero the inodes */
if (csum_feature_flag == EXT4_FEATURE_RO_COMPAT_GDT_CSUM) {
retval = zero_empty_inodes(fs);
if (retval) {
com_err("disable_uninit_bg", retval,
"while zeroing unused inodes");
request_fsck_afterwards(fs);
tune2fs: always check disable_uninit_bg() return code Enhance disable_uninit_bg() to return error codes -- if something goes wrong, we want to flag the FS as needing a fsck and exit. Mr. Reardon discovered that tune2fs -O ^metadata_csum on a FS with a corrupt bitmap would leave the FS in a weird state. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-12 03:43:33 +08:00
return retval;
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
}
}
/* The bbitmap is zeroed; we must mark group metadata blocks in use */
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
for (i = 0; i < fs->group_desc_count; i++) {
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
b = ext2fs_block_bitmap_loc(fs, i);
tune2fs: don't convert block # to cluster # when clearing uninit_bg When we're constructing the initial block bitmap as part of removing the gdt_csum (i.e. uninit_bg) feature, we mustn't convert the block numbers to cluster numbers because ext2fs_mark_block_bitmap2() does this for us. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-13 10:31:20 +08:00
ext2fs_mark_block_bitmap2(fs->block_map, b);
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
b = ext2fs_inode_bitmap_loc(fs, i);
tune2fs: don't convert block # to cluster # when clearing uninit_bg When we're constructing the initial block bitmap as part of removing the gdt_csum (i.e. uninit_bg) feature, we mustn't convert the block numbers to cluster numbers because ext2fs_mark_block_bitmap2() does this for us. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-13 10:31:20 +08:00
ext2fs_mark_block_bitmap2(fs->block_map, b);
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
retval = ext2fs_super_and_bgd_loc2(fs, i, &b, &c, &d, NULL);
if (retval == 0 && b)
tune2fs: don't convert block # to cluster # when clearing uninit_bg When we're constructing the initial block bitmap as part of removing the gdt_csum (i.e. uninit_bg) feature, we mustn't convert the block numbers to cluster numbers because ext2fs_mark_block_bitmap2() does this for us. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-13 10:31:20 +08:00
ext2fs_mark_block_bitmap2(fs->block_map, b);
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
if (retval == 0 && c)
tune2fs: don't convert block # to cluster # when clearing uninit_bg When we're constructing the initial block bitmap as part of removing the gdt_csum (i.e. uninit_bg) feature, we mustn't convert the block numbers to cluster numbers because ext2fs_mark_block_bitmap2() does this for us. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-13 10:31:20 +08:00
ext2fs_mark_block_bitmap2(fs->block_map, c);
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
if (retval == 0 && d)
tune2fs: don't convert block # to cluster # when clearing uninit_bg When we're constructing the initial block bitmap as part of removing the gdt_csum (i.e. uninit_bg) feature, we mustn't convert the block numbers to cluster numbers because ext2fs_mark_block_bitmap2() does this for us. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-13 10:31:20 +08:00
ext2fs_mark_block_bitmap2(fs->block_map, d);
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
if (retval) {
com_err("disable_uninit_bg", retval,
"while initializing block bitmaps");
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
request_fsck_afterwards(fs);
}
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
gd = ext2fs_group_desc(fs, fs->group_desc, i);
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
gd->bg_itable_unused = 0;
gd->bg_flags = 0;
ext2fs_group_desc_csum_set(fs, i);
}
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
tune2fs: zero inode table when removing checksums When disabling group checksums, we have to initialize the inode table. Right now tune2fs doesn't do this; it merely punts to e2fsck to clean up the mess. Unfortunately, if the "uninitialized" inode table contains things that look like inodes (i_link_count > 0, specifically), the e2fsck tries to recover these inodes. This leads to it misinterpreting i_blocks as a block map, at which point it needlessly resurrects phantom inodes and crosslinked file repairs. As part of initializing the block bitmaps, we must also mark block group metadata blocks in use. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2013-09-16 21:41:15 +08:00
ext2fs_mark_super_dirty(fs);
tune2fs: always check disable_uninit_bg() return code Enhance disable_uninit_bg() to return error codes -- if something goes wrong, we want to flag the FS as needing a fsck and exit. Mr. Reardon discovered that tune2fs -O ^metadata_csum on a FS with a corrupt bitmap would leave the FS in a weird state. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-12 03:43:33 +08:00
return 0;
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
}
tune2fs: allow user to turn on saving the checksum seed Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-06 01:38:52 +08:00
static void
try_confirm_csum_seed_support(void)
{
if (access("/sys/fs/ext4/features/metadata_csum_seed", R_OK))
fputs(_("WARNING: Could not confirm kernel support for "
"metadata_csum_seed.\n This requires Linux >= "
"v4.4.\n"), stderr);
}
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
/*
* Update the feature set as provided by the user.
*/
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
static int update_feature_set(ext2_filsys fs, char *features)
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
{
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
struct ext2_super_block *sb = fs->super;
tune2fs: Cleanup feature handling to avoid merge conflicts Use a more abstract set of feature tests to avoid merge conflicts as we add support for new features in the maint, master, next, and pu git branches. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 04:08:14 +08:00
__u32 old_features[3];
build: quiet build warnings for "gcc -Wall" Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-01-23 07:32:29 +08:00
int type_err;
Teach tune2fs to use e2p_edit_feature2() to provide better error handling Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 03:27:57 +08:00
unsigned int mask_err;
tune2fs: always check disable_uninit_bg() return code Enhance disable_uninit_bg() to return error codes -- if something goes wrong, we want to flag the FS as needing a fsck and exit. Mr. Reardon discovered that tune2fs -O ^metadata_csum on a FS with a corrupt bitmap would leave the FS in a weird state. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-12 03:43:33 +08:00
errcode_t err;
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
enum quota_type qtype;
tune2fs.c (main): If the environment variable TUNE2FS_SKIP_MOUNT_CHECK is set, do not try to check if the filesystem is mounted. (update_feature_set): If the compatibility bitmasks were not modified, don't set the superblock dirty bit.
2004-04-07 21:27:36 +08:00
tune2fs: Cleanup feature handling to avoid merge conflicts Use a more abstract set of feature tests to avoid merge conflicts as we add support for new features in the maint, master, next, and pu git branches. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 04:08:14 +08:00
#define FEATURE_ON(type, mask) (!(old_features[(type)] & (mask)) && \
((&sb->s_feature_compat)[(type)] & (mask)))
#define FEATURE_OFF(type, mask) ((old_features[(type)] & (mask)) && \
!((&sb->s_feature_compat)[(type)] & (mask)))
#define FEATURE_CHANGED(type, mask) ((mask) & \
(old_features[(type)] ^ (&sb->s_feature_compat)[(type)]))
old_features[E2P_FEATURE_COMPAT] = sb->s_feature_compat;
old_features[E2P_FEATURE_INCOMPAT] = sb->s_feature_incompat;
old_features[E2P_FEATURE_RO_INCOMPAT] = sb->s_feature_ro_compat;
Teach tune2fs to use e2p_edit_feature2() to provide better error handling Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 03:27:57 +08:00
if (e2p_edit_feature2(features, &sb->s_feature_compat,
ok_features, clear_ok_features,
&type_err, &mask_err)) {
if (!mask_err)
fprintf(stderr,
_("Invalid filesystem option set: %s\n"),
features);
else if (type_err & E2P_FEATURE_NEGATE_FLAG)
fprintf(stderr, _("Clearing filesystem feature '%s' "
"not supported.\n"),
e2p_feature2string(type_err &
E2P_FEATURE_TYPE_MASK,
mask_err));
else
fprintf(stderr, _("Setting filesystem feature '%s' "
"not supported.\n"),
e2p_feature2string(type_err, mask_err));
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 1;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
}
tune2fs: Cleanup feature handling to avoid merge conflicts Use a more abstract set of feature tests to avoid merge conflicts as we add support for new features in the maint, master, next, and pu git branches. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 04:08:14 +08:00
if (FEATURE_OFF(E2P_FEATURE_COMPAT, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
if ((mount_flags & EXT2_MF_MOUNTED) &&
!(mount_flags & EXT2_MF_READONLY)) {
mke2fs,tune2fs: Enable huge_file, dir_nlink, and extra_isize features Also change mke2fs.conf to enable huge_file,dir_nlink,extra_isize, and uninit_bg by default for ext4 filesystems, and enable extra_isize in the library as well. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-10 22:49:59 +08:00
fputs(_("The has_journal feature may only be "
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
"cleared when the filesystem is\n"
"unmounted or mounted "
"read-only.\n"), stderr);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 1;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
}
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (ext2fs_has_feature_journal_needs_recovery(sb) &&
tune2fs: allow removal of dirty journal with two "-f" options Jim pointed out that "tune2fs -f -O ^has_journal" won't remove the journal if the needs_recovery flag is set; the manpage seems to indicate that it should. And if you've lost an external journal and can no longer replay it, how should one proceed? Change tune2fs so that two "-f" options will allow removal of a dirty journal from a filesystem, even if the filesystem needs recovery. e2fsck can then do its best to pick up the pieces. Addresses-Debian-Bug: #559301 Reported-by: Jim Faulkner <james.faulkner@yale.edu> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2014-02-21 09:18:41 +08:00
f_flag < 2) {
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
fputs(_("The needs_recovery flag is set. "
"Please run e2fsck before clearing\n"
"the has_journal flag.\n"), stderr);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 1;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
}
if (sb->s_journal_inum) {
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
if (remove_journal_inode(fs))
return 1;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
}
tune2fs.c (update_feature_set): Don't require a forced fsck if we're removing an external journal from a filesystem.
2001-07-31 04:31:30 +08:00
if (sb->s_journal_dev) {
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
if (remove_journal_device(fs))
return 1;
tune2fs.c (update_feature_set): Don't require a forced fsck if we're removing an external journal from a filesystem.
2001-07-31 04:31:30 +08:00
}
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
}
e2fsprogs: Disallow tune2fs enabling sparse_super with ext4 meta_bg enabled When meta_bg feature is enabled, group descriptor block is allocated every 128 block group (or every 64 block group if 64bit feature is enabled). In such situation, files in block group more than #128 will be removed if sparse_super feature is enabled with tune2fs and afterwards necessary e2fsck running. Because tune2fs does not reallocate group descriptor blocks but just set sparse_super feature. If ext4 has sparse_super, ext2fs_descriptor_block_loc2() called by e2fsck thinks the block group (e.g. #128) that it has group descriptor block at the head offset. But that offset is used as backup super block before. So e2fsck fixes ext4 based on invalid group descriptor blocks and this cause data lost. The patch avoids this problem simply by disallow tune2fs enabling sparse_super if meta_bg is enabled. Steps to reproduce: 1. Create ext4 which has meta_bg, ^sparse_super and 129+ block groups. # mke2fs -t ext4 -O meta_bg,^resize_inode,^sparse_super DEV 17G # mount DEV /MP 2. Create direcotry and files which use block group #128's metadata. # echo $((8192*128+1)) > /sys/fs/ext4/DEV/inode_goal # mkdir /MP/DIR # for i in $(seq 1 100); do dd if=/dev/urandom of=/MP/DIR/file$i bs=1024 count=10; done 3. Enable sparse_super with tune2fs then execute e2fsck. Data in block group #128 will be lost!! # umount DEV # tune2fs -O sparse_super DEV # e2fsck/e2fsck -yf DEV Signed-off-by: Akira Fujita <a-fujita@rs.jp.ne.cocm> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-02-07 04:11:52 +08:00
if (FEATURE_ON(E2P_FEATURE_RO_INCOMPAT,
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)) {
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (ext2fs_has_feature_meta_bg(sb)) {
e2fsprogs: Disallow tune2fs enabling sparse_super with ext4 meta_bg enabled When meta_bg feature is enabled, group descriptor block is allocated every 128 block group (or every 64 block group if 64bit feature is enabled). In such situation, files in block group more than #128 will be removed if sparse_super feature is enabled with tune2fs and afterwards necessary e2fsck running. Because tune2fs does not reallocate group descriptor blocks but just set sparse_super feature. If ext4 has sparse_super, ext2fs_descriptor_block_loc2() called by e2fsck thinks the block group (e.g. #128) that it has group descriptor block at the head offset. But that offset is used as backup super block before. So e2fsck fixes ext4 based on invalid group descriptor blocks and this cause data lost. The patch avoids this problem simply by disallow tune2fs enabling sparse_super if meta_bg is enabled. Steps to reproduce: 1. Create ext4 which has meta_bg, ^sparse_super and 129+ block groups. # mke2fs -t ext4 -O meta_bg,^resize_inode,^sparse_super DEV 17G # mount DEV /MP 2. Create direcotry and files which use block group #128's metadata. # echo $((8192*128+1)) > /sys/fs/ext4/DEV/inode_goal # mkdir /MP/DIR # for i in $(seq 1 100); do dd if=/dev/urandom of=/MP/DIR/file$i bs=1024 count=10; done 3. Enable sparse_super with tune2fs then execute e2fsck. Data in block group #128 will be lost!! # umount DEV # tune2fs -O sparse_super DEV # e2fsck/e2fsck -yf DEV Signed-off-by: Akira Fujita <a-fujita@rs.jp.ne.cocm> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-02-07 04:11:52 +08:00
fputs(_("Setting filesystem feature 'sparse_super' "
"not supported\nfor filesystems with "
"the meta_bg feature enabled.\n"),
stderr);
return 1;
}
}
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
if (FEATURE_ON(E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_MMP)) {
int error;
if ((mount_flags & EXT2_MF_MOUNTED) ||
(mount_flags & EXT2_MF_READONLY)) {
fputs(_("The multiple mount protection feature can't\n"
"be set if the filesystem is mounted or\n"
"read-only.\n"), stderr);
return 1;
}
error = ext2fs_mmp_init(fs);
if (error) {
fputs(_("\nError while enabling multiple mount "
"protection feature."), stderr);
return 1;
}
/*
* We want to update group desc with the new free blocks count
*/
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
printf(_("Multiple mount protection has been enabled "
"with update interval %ds.\n"),
sb->s_mmp_update_interval);
}
if (FEATURE_OFF(E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_MMP)) {
int error;
if (mount_flags & EXT2_MF_READONLY) {
fputs(_("The multiple mount protection feature cannot\n"
"be disabled if the filesystem is readonly.\n"),
stderr);
return 1;
}
error = ext2fs_read_bitmaps(fs);
if (error) {
fputs(_("Error while reading bitmaps\n"), stderr);
return 1;
}
error = ext2fs_mmp_read(fs, sb->s_mmp_block, NULL);
if (error) {
struct mmp_struct *mmp_cmp = fs->mmp_cmp;
if (error == EXT2_ET_MMP_MAGIC_INVALID)
printf(_("Magic number in MMP block does not "
"match. expected: %x, actual: %x\n"),
EXT4_MMP_MAGIC, mmp_cmp->mmp_magic);
else
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
com_err(program_name, error, "%s",
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
_("while reading MMP block."));
goto mmp_error;
}
/* We need to force out the group descriptors as well */
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
e2fsprogs: fix blk_t <- blk64_t assignment mismatches Fix all the places where we should be using a blk64_t instead of a blk_t. These fixes are more severe because 64bit values could be truncated silently. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-07 21:51:48 +08:00
ext2fs_block_alloc_stats2(fs, sb->s_mmp_block, -1);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
mmp_error:
sb->s_mmp_block = 0;
sb->s_mmp_update_interval = 0;
}
tune2fs: Cleanup feature handling to avoid merge conflicts Use a more abstract set of feature tests to avoid merge conflicts as we add support for new features in the maint, master, next, and pu git branches. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 04:08:14 +08:00
if (FEATURE_ON(E2P_FEATURE_COMPAT, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
/*
* If adding a journal flag, let the create journal
tune2fs: Delete a stray word from a comment. Signed-off-by: Benno Schulenberg <bensberg@justemail.net> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2008-07-18 05:58:35 +08:00
* code below handle setting the flag and creating the
* journal. We supply a default size if necessary.
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
*/
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
if (!journal_size)
journal_size = -1;
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
ext2fs_clear_feature_journal(sb);
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
}
tune2fs: Cleanup feature handling to avoid merge conflicts Use a more abstract set of feature tests to avoid merge conflicts as we add support for new features in the maint, master, next, and pu git branches. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 04:08:14 +08:00
if (FEATURE_ON(E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_DIR_INDEX)) {
mke2fs.c (main): Enable directory indexing by default. tune2fs.c (update_feature_set): Allow directory indexing flag to be set. If so, set the default hash to be TEA, and initialize the hash seed to a random value.
2002-09-23 03:37:40 +08:00
if (!sb->s_def_hash_version)
tune2fs, mke2fs: Change default directory hash algorithm to half_md4 The half_md4 algorithm is faster and more collision resistant. Let's switch to it as the default. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-29 11:09:35 +08:00
sb->s_def_hash_version = EXT2_HASH_HALF_MD4;
mke2fs.c (main): Enable directory indexing by default. tune2fs.c (update_feature_set): Allow directory indexing flag to be set. If so, set the default hash to be TEA, and initialize the hash seed to a random value.
2002-09-23 03:37:40 +08:00
if (uuid_is_null((unsigned char *) sb->s_hash_seed))
uuid_generate((unsigned char *) sb->s_hash_seed);
}
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
Merge branch 'maint' Conflicts: lib/blkid/devname.c lib/blkid/probe.c misc/mke2fs.c misc/tune2fs.c
2008-02-28 07:53:34 +08:00
if (FEATURE_OFF(E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_FLEX_BG)) {
Enable FLEX_BG feature support Add FLEX_BG as a supported feature bit. Add support to mke2fs to create filesystems with FLEX_BG. Add support to tune2fs to add (and remove, if it won't break filesystem consistency) the FLEX_BG feature. Signed-off-by: Jose R. Santos <jrs@us.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> -- lib/e2p/feature.c | 2 ++ lib/ext2fs/ext2fs.h | 6 ++++-- misc/mke2fs.c | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-)
2007-08-14 12:32:57 +08:00
if (ext2fs_check_desc(fs)) {
fputs(_("Clearing the flex_bg flag would "
"cause the the filesystem to be\n"
"inconsistent.\n"), stderr);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 1;
Enable FLEX_BG feature support Add FLEX_BG as a supported feature bit. Add support to mke2fs to create filesystems with FLEX_BG. Add support to tune2fs to add (and remove, if it won't break filesystem consistency) the FLEX_BG feature. Signed-off-by: Jose R. Santos <jrs@us.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> -- lib/e2p/feature.c | 2 ++ lib/ext2fs/ext2fs.h | 6 ++++-- misc/mke2fs.c | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-)
2007-08-14 12:32:57 +08:00
}
}
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c: tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface so that -J is used to specify journal options, and -j is used to request creation of a journal using default values. (This is a UI change, but we haven't done a formal release, and it makes things much more consistent with the rest of the options out there.) tune2fs.c: Add support for removing a filesystem from an external journal; we correctly remove the filesystem UUID from the external journal's filesystem list.
2001-01-18 09:51:15 +08:00
mke2fs,tune2fs: Enable huge_file, dir_nlink, and extra_isize features Also change mke2fs.conf to enable huge_file,dir_nlink,extra_isize, and uninit_bg by default for ext4 filesystems, and enable extra_isize in the library as well. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-10 22:49:59 +08:00
if (FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT,
EXT4_FEATURE_RO_COMPAT_HUGE_FILE)) {
if ((mount_flags & EXT2_MF_MOUNTED) &&
!(mount_flags & EXT2_MF_READONLY)) {
fputs(_("The huge_file feature may only be "
"cleared when the filesystem is\n"
"unmounted or mounted "
"read-only.\n"), stderr);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 1;
mke2fs,tune2fs: Enable huge_file, dir_nlink, and extra_isize features Also change mke2fs.conf to enable huge_file,dir_nlink,extra_isize, and uninit_bg by default for ext4 filesystems, and enable extra_isize in the library as well. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-10 22:49:59 +08:00
}
}
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
if (FEATURE_ON(E2P_FEATURE_RO_INCOMPAT,
EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
tune2fs: confirm dangerous operations Give admins a short amount of time to confirm that they want to proceed with a dangerous operation. Refuse to perform the op unless the filesystem is freshly checked. Cc: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-02-14 06:38:11 +08:00
check_fsck_needed(fs,
_("Enabling checksums could take some time."));
tune2fs: abort when trying to enable/disable metadata_csum on mounted fs Earlier, I tried to make tune2fs abort if the user tried to enable or disable metadata_csum on a mounted FS, but forgot the exit() call. Supply it now. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:25 +08:00
if (mount_flags & EXT2_MF_MOUNTED) {
tune2fs: don't change metadata_csum on a mounted fs Don't let users change metadata_csum on a mounted filesystem because there's no way to tell the kernel to turn on the feature; there's no way to prevent the kernel from rewriting on-disk structures while tune2fs is also rewriting them; and there's no way to tell the kernel to reload them after tune2fs is finished. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-11-05 00:52:26 +08:00
fputs(_("Cannot enable metadata_csum on a mounted "
"filesystem!\n"), stderr);
tune2fs: abort when trying to enable/disable metadata_csum on mounted fs Earlier, I tried to make tune2fs abort if the user tried to enable or disable metadata_csum on a mounted FS, but forgot the exit() call. Supply it now. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:25 +08:00
exit(1);
}
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (!ext2fs_has_feature_extents(fs->super))
tune2fs: warn if extents are not enabled when turning on metadata_csum Warn the user if we're trying to enable metadata_csum on a FS that doesn't support extents (since block maps cannot contain checksums). Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-12-14 10:57:20 +08:00
printf("%s",
_("Extents are not enabled. The file extent "
"tree can be checksummed, whereas block maps "
"cannot. Not enabling extents reduces the "
"coverage of metadata checksumming. "
"Re-run with -O extent to rectify.\n"));
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (!ext2fs_has_feature_64bit(fs->super))
resize2fs: convert fs to and from 64bit mode resize2fs does its magic by loading a filesystem, duplicating the in-memory image of that fs, moving relevant blocks out of the way of whatever new metadata get created, and finally writing everything back out to disk. Enabling 64bit mode enlarges the group descriptors, which makes resize2fs a reasonable vehicle for taking care of the rest of the bookkeeping requirements, so add to resize2fs the ability to convert a filesystem to 64bit mode and back. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Cc: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-12-16 01:40:03 +08:00
printf("%s",
_("64-bit filesystem support is not enabled. "
"The larger fields afforded by this feature "
"enable full-strength checksumming. "
"Run resize2fs -b to rectify.\n"));
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
rewrite_checksums = 1;
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
/* metadata_csum supersedes uninit_bg */
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
ext2fs_clear_feature_gdt_csum(fs->super);
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
/* if uninit_bg was previously off, rewrite group desc */
if (!(old_features[E2P_FEATURE_RO_INCOMPAT] &
EXT4_FEATURE_RO_COMPAT_GDT_CSUM))
enable_uninit_bg(fs);
/*
* Since metadata_csum supersedes uninit_bg, pretend like
* uninit_bg has been off all along.
*/
old_features[E2P_FEATURE_RO_INCOMPAT] &=
~EXT4_FEATURE_RO_COMPAT_GDT_CSUM;
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
}
if (FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT,
EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
tune2fs: enable uninit_bg when disabling metadata_csum If we're disabling metadata_csum and the user doesn't provide explicit instructions to enable or disable uninit_bg, assume that they want uninit_bg to be turned on by default. Otherwise, we lose all block group flags and unused inode count, which is a big hit to performance. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-12-14 10:58:26 +08:00
__u32 test_features[3];
tune2fs: confirm dangerous operations Give admins a short amount of time to confirm that they want to proceed with a dangerous operation. Refuse to perform the op unless the filesystem is freshly checked. Cc: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-02-14 06:38:11 +08:00
check_fsck_needed(fs,
_("Disabling checksums could take some time."));
tune2fs: abort when trying to enable/disable metadata_csum on mounted fs Earlier, I tried to make tune2fs abort if the user tried to enable or disable metadata_csum on a mounted FS, but forgot the exit() call. Supply it now. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:25 +08:00
if (mount_flags & EXT2_MF_MOUNTED) {
tune2fs: don't change metadata_csum on a mounted fs Don't let users change metadata_csum on a mounted filesystem because there's no way to tell the kernel to turn on the feature; there's no way to prevent the kernel from rewriting on-disk structures while tune2fs is also rewriting them; and there's no way to tell the kernel to reload them after tune2fs is finished. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-11-05 00:52:26 +08:00
fputs(_("Cannot disable metadata_csum on a mounted "
"filesystem!\n"), stderr);
tune2fs: abort when trying to enable/disable metadata_csum on mounted fs Earlier, I tried to make tune2fs abort if the user tried to enable or disable metadata_csum on a mounted FS, but forgot the exit() call. Supply it now. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:25 +08:00
exit(1);
}
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
rewrite_checksums = 1;
tune2fs: enable uninit_bg when disabling metadata_csum If we're disabling metadata_csum and the user doesn't provide explicit instructions to enable or disable uninit_bg, assume that they want uninit_bg to be turned on by default. Otherwise, we lose all block group flags and unused inode count, which is a big hit to performance. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-12-14 10:58:26 +08:00
/* Enable uninit_bg unless the user expressly turned it off */
memcpy(test_features, old_features, sizeof(test_features));
test_features[E2P_FEATURE_RO_INCOMPAT] |=
EXT4_FEATURE_RO_COMPAT_GDT_CSUM;
e2p_edit_feature2(features, test_features, ok_features,
clear_ok_features, NULL, NULL);
if (test_features[E2P_FEATURE_RO_INCOMPAT] &
EXT4_FEATURE_RO_COMPAT_GDT_CSUM)
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
ext2fs_set_feature_gdt_csum(fs->super);
tune2fs: enable uninit_bg when disabling metadata_csum If we're disabling metadata_csum and the user doesn't provide explicit instructions to enable or disable uninit_bg, assume that they want uninit_bg to be turned on by default. Otherwise, we lose all block group flags and unused inode count, which is a big hit to performance. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-12-14 10:58:26 +08:00
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
/*
* If we're turning off metadata_csum and not turning on
* uninit_bg, rewrite group desc.
*/
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (!ext2fs_has_feature_gdt_csum(fs->super)) {
tune2fs: always check disable_uninit_bg() return code Enhance disable_uninit_bg() to return error codes -- if something goes wrong, we want to flag the FS as needing a fsck and exit. Mr. Reardon discovered that tune2fs -O ^metadata_csum on a FS with a corrupt bitmap would leave the FS in a weird state. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-12 03:43:33 +08:00
err = disable_uninit_bg(fs,
EXT4_FEATURE_RO_COMPAT_METADATA_CSUM);
if (err)
return 1;
} else
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
/*
* metadata_csum previously provided uninit_bg, so if
* we're also setting the uninit_bg feature bit,
* pretend like it was previously enabled. Checksums
* will be rewritten with crc16 later.
*/
old_features[E2P_FEATURE_RO_INCOMPAT] |=
EXT4_FEATURE_RO_COMPAT_GDT_CSUM;
tune2fs: allow user to turn on saving the checksum seed Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-06 01:38:52 +08:00
fs->super->s_checksum_seed = 0;
ext2fs_clear_feature_csum_seed(fs->super);
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
}
tune2fs: Enable uninit_bg to be set without requiring an fsck Allow the uninit_bg feature to be set without requiring an fsck. The first full fsck will require scanning all of the inode table blocks, but subsequent fsck's will be fast. This allows flexibility over requiring a full fsck after setting this feature, which is what tune2fs previously mandated. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-05-20 00:14:39 +08:00
if (FEATURE_ON(E2P_FEATURE_RO_INCOMPAT,
EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
/* Do not enable uninit_bg when metadata_csum enabled */
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (ext2fs_has_feature_metadata_csum(fs->super))
ext2fs_clear_feature_gdt_csum(fs->super);
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
else
enable_uninit_bg(fs);
tune2fs: Enable uninit_bg to be set without requiring an fsck Allow the uninit_bg feature to be set without requiring an fsck. The first full fsck will require scanning all of the inode table blocks, but subsequent fsck's will be fast. This allows flexibility over requiring a full fsck after setting this feature, which is what tune2fs previously mandated. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-05-20 00:14:39 +08:00
}
if (FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT,
tune2fs: always check disable_uninit_bg() return code Enhance disable_uninit_bg() to return error codes -- if something goes wrong, we want to flag the FS as needing a fsck and exit. Mr. Reardon discovered that tune2fs -O ^metadata_csum on a FS with a corrupt bitmap would leave the FS in a weird state. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-12 03:43:33 +08:00
EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
err = disable_uninit_bg(fs,
tune2fs: rewrite block group checksums when changing checksumming feature flags When toggling the metadata_csum and uninit_bg feature flags, we should rewrite the block groups with the desired checksum. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-08-03 08:47:45 +08:00
EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
tune2fs: always check disable_uninit_bg() return code Enhance disable_uninit_bg() to return error codes -- if something goes wrong, we want to flag the FS as needing a fsck and exit. Mr. Reardon discovered that tune2fs -O ^metadata_csum on a FS with a corrupt bitmap would leave the FS in a weird state. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-12 03:43:33 +08:00
if (err)
return 1;
}
tune2fs: Enable uninit_bg to be set without requiring an fsck Allow the uninit_bg feature to be set without requiring an fsck. The first full fsck will require scanning all of the inode table blocks, but subsequent fsck's will be fast. This allows flexibility over requiring a full fsck after setting this feature, which is what tune2fs previously mandated. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-05-20 00:14:39 +08:00
tune2fs: direct user to resize2fs for 64bit conversion If the user tries to enable or disable the 64bit feature via tune2fs, tell them how to use resize2fs to effect the conversion. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:47 +08:00
/*
* We don't actually toggle 64bit; resize2fs does that. But this
* must come after the metadata_csum feature_on so that it won't
* complain about the lack of 64bit.
*/
if (FEATURE_ON(E2P_FEATURE_INCOMPAT,
EXT4_FEATURE_INCOMPAT_64BIT)) {
if (mount_flags & EXT2_MF_MOUNTED) {
fprintf(stderr, _("Cannot enable 64-bit mode "
"while mounted!\n"));
exit(1);
}
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
ext2fs_clear_feature_64bit(sb);
tune2fs: direct user to resize2fs for 64bit conversion If the user tries to enable or disable the 64bit feature via tune2fs, tell them how to use resize2fs to effect the conversion. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:47 +08:00
feature_64bit = 1;
}
if (FEATURE_OFF(E2P_FEATURE_INCOMPAT,
EXT4_FEATURE_INCOMPAT_64BIT)) {
if (mount_flags & EXT2_MF_MOUNTED) {
fprintf(stderr, _("Cannot disable 64-bit mode "
"while mounted!\n"));
exit(1);
}
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
ext2fs_set_feature_64bit(sb);
tune2fs: direct user to resize2fs for 64bit conversion If the user tries to enable or disable the 64bit feature via tune2fs, tell them how to use resize2fs to effect the conversion. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:47 +08:00
feature_64bit = -1;
}
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
if (FEATURE_ON(E2P_FEATURE_RO_INCOMPAT,
EXT4_FEATURE_RO_COMPAT_QUOTA)) {
/*
* Set the Q_flag here and handle the quota options in the code
* below.
*/
if (!Q_flag) {
Q_flag = 1;
Add project quota support This patch adds project quota support. An new quota type PRJQUOTA(2) is added. EXT4_PRJ_QUOTA_INO(11) is reserved for project quota inode. The super block reservers an field s_prj_quota_inum for saving project quota inode. And each inode adds an internal field i_projid for saving its project ID. Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-01 11:57:05 +08:00
/* Enable usr/grp quota by default */
for (qtype = 0; qtype < MAXQUOTAS; qtype++) {
if (qtype != PRJQUOTA)
quota_enable[qtype] = QOPT_ENABLE;
else
quota_enable[qtype] = QOPT_DISABLE;
}
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
}
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
ext2fs_clear_feature_quota(sb);
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
}
Add project quota support This patch adds project quota support. An new quota type PRJQUOTA(2) is added. EXT4_PRJ_QUOTA_INO(11) is reserved for project quota inode. The super block reservers an field s_prj_quota_inum for saving project quota inode. And each inode adds an internal field i_projid for saving its project ID. Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-01 11:57:05 +08:00
if (FEATURE_ON(E2P_FEATURE_RO_INCOMPAT,
EXT4_FEATURE_RO_COMPAT_PROJECT)) {
if (!Q_flag && !ext2fs_has_feature_quota(sb))
fputs(_("\nWarning: enabled project without quota together\n"),
stderr);
Q_flag = 1;
quota_enable[PRJQUOTA] = QOPT_ENABLE;
}
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
if (FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT,
EXT4_FEATURE_RO_COMPAT_QUOTA)) {
/*
* Set the Q_flag here and handle the quota options in the code
* below.
*/
if (Q_flag)
fputs(_("\nWarning: '^quota' option overrides '-Q'"
"arguments.\n"), stderr);
Q_flag = 1;
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
/* Disable all quota by default */
for (qtype = 0; qtype < MAXQUOTAS; qtype++)
quota_enable[qtype] = QOPT_DISABLE;
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
}
tune2fs: add ability to enable the encrypt feature Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-04-06 08:42:58 +08:00
if (FEATURE_ON(E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_ENCRYPT)) {
fs->super->s_encrypt_algos[0] =
EXT4_ENCRYPTION_MODE_AES_256_XTS;
fs->super->s_encrypt_algos[1] =
EXT4_ENCRYPTION_MODE_AES_256_CTS;
}
tune2fs: allow user to turn on saving the checksum seed Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-06 01:38:52 +08:00
if (FEATURE_ON(E2P_FEATURE_INCOMPAT,
EXT4_FEATURE_INCOMPAT_CSUM_SEED)) {
if (!ext2fs_has_feature_metadata_csum(sb)) {
fputs(_("Setting feature 'metadata_csum_seed' "
"is only supported\non filesystems with "
"the metadata_csum feature enabled.\n"),
stderr);
return 1;
}
try_confirm_csum_seed_support();
fs->super->s_checksum_seed = fs->csum_seed;
}
if (FEATURE_OFF(E2P_FEATURE_INCOMPAT,
EXT4_FEATURE_INCOMPAT_CSUM_SEED)) {
__le32 uuid_seed;
uuid_seed = ext2fs_crc32c_le(~0, fs->super->s_uuid,
sizeof(fs->super->s_uuid));
if (fs->super->s_checksum_seed != uuid_seed &&
(mount_flags & EXT2_MF_MOUNTED)) {
fputs(_("UUID has changed since enabling "
"metadata_csum. Filesystem must be unmounted "
"\nto safely rewrite all metadata to "
"match the new UUID.\n"), stderr);
return 1;
}
rewrite_checksums = 1;
}
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
if (sb->s_rev_level == EXT2_GOOD_OLD_REV &&
(sb->s_feature_compat || sb->s_feature_ro_compat ||
sb->s_feature_incompat))
ext2fs_update_dynamic_rev(fs);
tune2fs: Cleanup feature handling to avoid merge conflicts Use a more abstract set of feature tests to avoid merge conflicts as we add support for new features in the maint, master, next, and pu git branches. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 04:08:14 +08:00
if (FEATURE_CHANGED(E2P_FEATURE_RO_INCOMPAT,
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER) ||
mke2fs,tune2fs: Enable huge_file, dir_nlink, and extra_isize features Also change mke2fs.conf to enable huge_file,dir_nlink,extra_isize, and uninit_bg by default for ext4 filesystems, and enable extra_isize in the library as well. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-10 22:49:59 +08:00
FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT,
EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ||
tune2fs: Cleanup feature handling to avoid merge conflicts Use a more abstract set of feature tests to avoid merge conflicts as we add support for new features in the maint, master, next, and pu git branches. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 04:08:14 +08:00
FEATURE_CHANGED(E2P_FEATURE_INCOMPAT,
tune2fs: Add support to clear the resize_inode feature This requires an fsck aftwards. We don't allow setting the resize_inode feature because extensive work to tune2fs or e2fsck to safely relocate blocks is necessary in order to reserve the blocks needed by the resize inode. Addresses-Red-Hat-Bugzilla: #167816 Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 06:31:06 +08:00
EXT2_FEATURE_INCOMPAT_FILETYPE) ||
FEATURE_CHANGED(E2P_FEATURE_COMPAT,
Add support for manipulating large_file feature in mke2fs and tune2fs Previously we just let the kernel and e2fsck do this automatically, but e2fsck will no longer automatically clear the large_file feature. It still isn't really necessary to worry about this feature flag explicitly, but some users seem to care. Addresses-Red-Hat-Bugzilla: #258381 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-28 04:01:19 +08:00
EXT2_FEATURE_COMPAT_RESIZE_INODE) ||
FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT,
tune2fs: Enable uninit_bg to be set without requiring an fsck Allow the uninit_bg feature to be set without requiring an fsck. The first full fsck will require scanning all of the inode table blocks, but subsequent fsck's will be fast. This allows flexibility over requiring a full fsck after setting this feature, which is what tune2fs previously mandated. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-05-20 00:14:39 +08:00
EXT2_FEATURE_RO_COMPAT_LARGE_FILE))
request_fsck_afterwards(fs);
tune2fs: Cleanup feature handling to avoid merge conflicts Use a more abstract set of feature tests to avoid merge conflicts as we add support for new features in the maint, master, next, and pu git branches. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-27 04:08:14 +08:00
if ((old_features[E2P_FEATURE_COMPAT] != sb->s_feature_compat) ||
(old_features[E2P_FEATURE_INCOMPAT] != sb->s_feature_incompat) ||
(old_features[E2P_FEATURE_RO_INCOMPAT] != sb->s_feature_ro_compat))
tune2fs.c (main): If the environment variable TUNE2FS_SKIP_MOUNT_CHECK is set, do not try to check if the filesystem is mounted. (update_feature_set): If the compatibility bitmasks were not modified, don't set the superblock dirty bit.
2004-04-07 21:27:36 +08:00
ext2fs_mark_super_dirty(fs);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 0;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
}
/*
* Add a journal to the filesystem.
*/
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
static int add_journal(ext2_filsys fs)
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
{
unsigned long journal_blocks;
errcode_t retval;
ChangeLog, Makefile.in, dumpe2fs.c, jfs_user.h, mke2fs.c, tune2fs.c: tune2fs.c: Changed the external journal code so that it simply adds a filesystem to a journal; the journal must have bene created via "mke2fs -O journal_dev /dev/XXX". mke2fs.c: Add support for creating an external journal device by using the command "mke2fs -O journal_dev /dev/XXX". Also changed the external journal code so -j device=/dev/XXX it simply adds a filesystem to that journal; the journal must have been created via separate step. dumpe2fs.c (print_journal_information): Add support for dumping information about an external journal device.
2001-01-16 15:47:31 +08:00
ext2_filsys jfs;
Add --enable-test-io-debug configure option which causes e2fsck and tune2fs to use the test I/O manager. The test I/O manager has been changed to not do anything extra by default, unless the TEST_IO_FLAGS and/or TEST_IO_BLOCK environment variables are set, which controls what I/O operations are logged and a block number to watch, respectively. The log messages are sent to stderr by default, unless a filename is specified via the TEST_IO_LOGFILE environment variable.
2003-05-06 00:08:47 +08:00
io_manager io_ptr;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (ext2fs_has_feature_journal(fs->super)) {
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
fputs(_("The filesystem already has a journal.\n"), stderr);
get_device_by_label.[ch], fsck.c, util.c: New interpret_spec() function in get_device_by_label.c to allow the use of UUID= or LABEL= when creating filesystems which use external journal dev (e.g. mke2fs -J device=LABEL=<journal_label>). tune2fs.c: Use superblock s_journal_uuid to locate an external journal device instead of s_journal_dev when removing it. Allow opening journal devices to set the label and UUID in the ext2 superblock. mke2fs.c, tune2fs.c: Free journal_device after use, as it is malloc'd in interpret spec.
2001-08-17 17:48:11 +08:00
goto err;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
}
if (journal_device) {
mke2fs, tune2fs: call proceed_question() from check_plausibility()'s caller Move the call to proceed_question() from check_plausibility() to its caller. This allows more fine grained control by mke2fs about when it might want to call check_plausibility(). Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2014-04-27 01:14:32 +08:00
if (!check_plausibility(journal_device, CHECK_BLOCK_DEV,
NULL))
mke2fs: add an option in mke2fs.conf to proceed after a delay If mke2fs needs to ask the user for permission, and the user doesn't type anything the specified delay in the /etc/mke2fs.conf file, proceed as if the user had said yes. The default is to do what we currently do, which is to wait until the user answers the question one way or the other. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2014-04-27 05:34:52 +08:00
proceed_question(-1);
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
check_mount(journal_device, 0, _("journal"));
Add --enable-test-io-debug configure option which causes e2fsck and tune2fs to use the test I/O manager. The test I/O manager has been changed to not do anything extra by default, unless the TEST_IO_FLAGS and/or TEST_IO_BLOCK environment variables are set, which controls what I/O operations are logged and a block number to watch, respectively. The log messages are sent to stderr by default, unless a filename is specified via the TEST_IO_LOGFILE environment variable.
2003-05-06 00:08:47 +08:00
#ifdef CONFIG_TESTIO_DEBUG
Only use the test_io manager if the right environment variables are set In order to make it possible for the test_io manager to be compiled in by default, make all of the programs that might try to use it to only do so if the environment variables TEST_IO_FLAGS and TEST_IO_DEBUG are set. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-09-01 23:17:29 +08:00
if (getenv("TEST_IO_FLAGS") || getenv("TEST_IO_BLOCK")) {
io_ptr = test_io_manager;
test_io_backing_manager = unix_io_manager;
} else
Add --enable-test-io-debug configure option which causes e2fsck and tune2fs to use the test I/O manager. The test I/O manager has been changed to not do anything extra by default, unless the TEST_IO_FLAGS and/or TEST_IO_BLOCK environment variables are set, which controls what I/O operations are logged and a block number to watch, respectively. The log messages are sent to stderr by default, unless a filename is specified via the TEST_IO_LOGFILE environment variable.
2003-05-06 00:08:47 +08:00
#endif
Only use the test_io manager if the right environment variables are set In order to make it possible for the test_io manager to be compiled in by default, make all of the programs that might try to use it to only do so if the environment variables TEST_IO_FLAGS and TEST_IO_DEBUG are set. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-09-01 23:17:29 +08:00
io_ptr = unix_io_manager;
ChangeLog, Makefile.in, dumpe2fs.c, jfs_user.h, mke2fs.c, tune2fs.c: tune2fs.c: Changed the external journal code so that it simply adds a filesystem to a journal; the journal must have bene created via "mke2fs -O journal_dev /dev/XXX". mke2fs.c: Add support for creating an external journal device by using the command "mke2fs -O journal_dev /dev/XXX". Also changed the external journal code so -j device=/dev/XXX it simply adds a filesystem to that journal; the journal must have been created via separate step. dumpe2fs.c (print_journal_information): Add support for dumping information about an external journal device.
2001-01-16 15:47:31 +08:00
retval = ext2fs_open(journal_device, EXT2_FLAG_RW|
EXT2_FLAG_JOURNAL_DEV_OK, 0,
Add --enable-test-io-debug configure option which causes e2fsck and tune2fs to use the test I/O manager. The test I/O manager has been changed to not do anything extra by default, unless the TEST_IO_FLAGS and/or TEST_IO_BLOCK environment variables are set, which controls what I/O operations are logged and a block number to watch, respectively. The log messages are sent to stderr by default, unless a filename is specified via the TEST_IO_LOGFILE environment variable.
2003-05-06 00:08:47 +08:00
fs->blocksize, io_ptr, &jfs);
ChangeLog, Makefile.in, dumpe2fs.c, jfs_user.h, mke2fs.c, tune2fs.c: tune2fs.c: Changed the external journal code so that it simply adds a filesystem to a journal; the journal must have bene created via "mke2fs -O journal_dev /dev/XXX". mke2fs.c: Add support for creating an external journal device by using the command "mke2fs -O journal_dev /dev/XXX". Also changed the external journal code so -j device=/dev/XXX it simply adds a filesystem to that journal; the journal must have been created via separate step. dumpe2fs.c (print_journal_information): Add support for dumping information about an external journal device.
2001-01-16 15:47:31 +08:00
if (retval) {
com_err(program_name, retval,
ChangeLog, mke2fs.c, tune2fs.c: mke2fs.c, tune2fs.c: Add newlines to error messages so that they look nicer.
2001-04-17 09:01:49 +08:00
_("\n\twhile trying to open journal on %s\n"),
ChangeLog, Makefile.in, dumpe2fs.c, jfs_user.h, mke2fs.c, tune2fs.c: tune2fs.c: Changed the external journal code so that it simply adds a filesystem to a journal; the journal must have bene created via "mke2fs -O journal_dev /dev/XXX". mke2fs.c: Add support for creating an external journal device by using the command "mke2fs -O journal_dev /dev/XXX". Also changed the external journal code so -j device=/dev/XXX it simply adds a filesystem to that journal; the journal must have been created via separate step. dumpe2fs.c (print_journal_information): Add support for dumping information about an external journal device.
2001-01-16 15:47:31 +08:00
journal_device);
get_device_by_label.[ch], fsck.c, util.c: New interpret_spec() function in get_device_by_label.c to allow the use of UUID= or LABEL= when creating filesystems which use external journal dev (e.g. mke2fs -J device=LABEL=<journal_label>). tune2fs.c: Use superblock s_journal_uuid to locate an external journal device instead of s_journal_dev when removing it. Allow opening journal devices to set the label and UUID in the ext2 superblock. mke2fs.c, tune2fs.c: Free journal_device after use, as it is malloc'd in interpret spec.
2001-08-17 17:48:11 +08:00
goto err;
ChangeLog, Makefile.in, dumpe2fs.c, jfs_user.h, mke2fs.c, tune2fs.c: tune2fs.c: Changed the external journal code so that it simply adds a filesystem to a journal; the journal must have bene created via "mke2fs -O journal_dev /dev/XXX". mke2fs.c: Add support for creating an external journal device by using the command "mke2fs -O journal_dev /dev/XXX". Also changed the external journal code so -j device=/dev/XXX it simply adds a filesystem to that journal; the journal must have been created via separate step. dumpe2fs.c (print_journal_information): Add support for dumping information about an external journal device.
2001-01-16 15:47:31 +08:00
}
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
printf(_("Creating journal on device %s: "),
journal_device);
ChangeLog, tune2fs.c: tune2fs.c (add_journal): Minor fixes from Andreas Dilger. Flush stdout after printing in-progress message. (main): Exit with status code 1 if we failed to determine the mount status of the device. ChangeLog, gcc-wall-cleanup: gcc-wall-cleanup: Remove additional annoying warning messages emited by gcc 2.95.2. ChangeLog, uuid.h: uuid: Change arguments to make it clear which argument is the source and which is the destination.
2001-01-15 00:11:14 +08:00
fflush(stdout);
get_device_by_label.[ch], fsck.c, util.c: New interpret_spec() function in get_device_by_label.c to allow the use of UUID= or LABEL= when creating filesystems which use external journal dev (e.g. mke2fs -J device=LABEL=<journal_label>). tune2fs.c: Use superblock s_journal_uuid to locate an external journal device instead of s_journal_dev when removing it. Allow opening journal devices to set the label and UUID in the ext2 superblock. mke2fs.c, tune2fs.c: Free journal_device after use, as it is malloc'd in interpret spec.
2001-08-17 17:48:11 +08:00
ChangeLog, Makefile.in, dumpe2fs.c, jfs_user.h, mke2fs.c, tune2fs.c: tune2fs.c: Changed the external journal code so that it simply adds a filesystem to a journal; the journal must have bene created via "mke2fs -O journal_dev /dev/XXX". mke2fs.c: Add support for creating an external journal device by using the command "mke2fs -O journal_dev /dev/XXX". Also changed the external journal code so -j device=/dev/XXX it simply adds a filesystem to that journal; the journal must have been created via separate step. dumpe2fs.c (print_journal_information): Add support for dumping information about an external journal device.
2001-01-16 15:47:31 +08:00
retval = ext2fs_add_journal_device(fs, jfs);
e2fsprogs: introduce ext2fs_close_free() helper Currently there are many uses of ext2fs_close() which might be wrong. First of all ext2fs_close() does not set the ext2_filsys pointer to NULL so the caller is responsible for clearing it, however there are some cases there we do not do it. Second of all very small number of users of ext2fs_close() actually check the return value. If there is a problem in ext2fs_close() it will not even free the ext2_filsys structure, but majority of users expect it to do so. To fix both problems this commit introduces a new helper ext2fs_close_free() which will not only check for the return value and free the ext2_filsys structure if the call to ext2fs_close2() failed, but it will also set the ext2_filsys pointer to NULL. Replace every use of ext2fs_close() in e2fsprogs tools with ext2fs_close_free() - there is no real reason to keep using ext2fs_close(). Signed-off-by: Lukas Czerner <lczerner@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
2014-07-06 09:06:29 +08:00
ext2fs_close_free(&jfs);
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
if (retval) {
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
com_err(program_name, retval,
_("while adding filesystem to journal on %s"),
journal_device);
get_device_by_label.[ch], fsck.c, util.c: New interpret_spec() function in get_device_by_label.c to allow the use of UUID= or LABEL= when creating filesystems which use external journal dev (e.g. mke2fs -J device=LABEL=<journal_label>). tune2fs.c: Use superblock s_journal_uuid to locate an external journal device instead of s_journal_dev when removing it. Allow opening journal devices to set the label and UUID in the ext2 superblock. mke2fs.c, tune2fs.c: Free journal_device after use, as it is malloc'd in interpret spec.
2001-08-17 17:48:11 +08:00
goto err;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
}
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
fputs(_("done\n"), stdout);
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
} else if (journal_size) {
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
fputs(_("Creating journal inode: "), stdout);
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
fflush(stdout);
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: ke2fs.8.in, tune2fs.8.in: Change man paegs to document that the journal must be bewteen 1024 and 10,240 file system blocks. mke2fs.c, tune2fs.c: Change to use figure_journal_size() util.c, util.h (figure_journal_size): Change journal_default_size into routine which also converts the requested journal size into filesystem blocks and does bounds checking to make sure the journal is sized reasonably. Renamed function to journal_default_size. parse_journal_opts): Remove bounds check for the journal size, since this is now done in figure_journal_size, and based on the number of filesystem blocks, as opposed to using the absolute size of the journal.
2001-03-27 04:07:13 +08:00
journal_blocks = figure_journal_size(journal_size, fs);
tune2fs, mke2fs: add the ability to control the location of the journal Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2014-01-29 01:58:56 +08:00
if (journal_location_string)
journal_location =
parse_num_blocks2(journal_location_string,
fs->super->s_log_block_size);
retval = ext2fs_add_journal_inode2(fs, journal_blocks,
journal_location,
journal_flags);
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
if (retval) {
* tune2fs.c: Make sure that error messages are sent to stderr, and normal messages are sent to stdout. (Addresses Debian bug #108555.)
2001-08-16 07:17:37 +08:00
fprintf(stderr, "\n");
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
com_err(program_name, retval, "%s",
ChangeLog, mke2fs.c, tune2fs.c: mke2fs.c, tune2fs.c: Add newlines to error messages so that they look nicer.
2001-04-17 09:01:49 +08:00
_("\n\twhile trying to create journal file"));
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return retval;
ChangeLog, mke2fs.c, tune2fs.c: mke2fs.c, tune2fs.c: Add newlines to error messages so that they look nicer.
2001-04-17 09:01:49 +08:00
} else
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
fputs(_("done\n"), stdout);
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
/*
* If the filesystem wasn't mounted, we need to force
* the block group descriptors out.
*/
if ((mount_flags & EXT2_MF_MOUNTED) == 0)
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
}
mke2fs: Use ext2fs_flush() only once We are doing ext2fs_flush() twice right now at the end of the mke2fs. First by directly calling ext2fs_flush() which is intended to write superblock and fs accounting information. And then it is invoked again when we are calling ext2fs_close(), only this time, because the fs is not dirty, we are writing out only superblock. I think it is bad to call it twice because even when writing only super block it takes some time on bigger file systems and moreover ext2fs_close() can fail without any reasonable explanation for the user. Also ext2fs_flush() is printing out progress and it is confusing for the users. Fix all this by removing the ext2fs_flush() and leaving it all to ext2fs_close(). However we need to introduce new variables to store check interval and max mount count, because fs structure is freed on ext2fs_close() and we really want to print those information as the last info for the user. [ Fixed type mismatch in a printf format statement -tytso] Signed-off-by: Lukas Czerner <lczerner@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-14 10:24:11 +08:00
print_check_message(fs->super->s_max_mnt_count,
fs->super->s_checkinterval);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 0;
get_device_by_label.[ch], fsck.c, util.c: New interpret_spec() function in get_device_by_label.c to allow the use of UUID= or LABEL= when creating filesystems which use external journal dev (e.g. mke2fs -J device=LABEL=<journal_label>). tune2fs.c: Use superblock s_journal_uuid to locate an external journal device instead of s_journal_dev when removing it. Allow opening journal devices to set the label and UUID in the ext2 superblock. mke2fs.c, tune2fs.c: Free journal_device after use, as it is malloc'd in interpret spec.
2001-08-17 17:48:11 +08:00
err:
remove useless if-before-free tests In case you're wondering about whether this change is safe from a portability standpoint, fear not. This has been beaten to death in other forums. Here are a few threads: http://thread.gmane.org/gmane.comp.version-control.git/74187 http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/12712 http://thread.gmane.org/gmane.emacs.devel/98144 http://thread.gmane.org/gmane.comp.lib.glibc.alpha/13092 There has been debate about whether it's a good idea from a performance standpoint, too, but imho you'll have a hard time finding an instance where this sort of change induces a measurable performance penalty. If you do, please let me know. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-02-24 01:07:50 +08:00
free(journal_device);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 1;
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
}
misc: fix gcc -Wall warnings Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-05-20 08:03:48 +08:00
static void handle_quota_options(ext2_filsys fs)
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
{
libsupport: fix gcc -Wall nits Also add better error checking to mke2fs and e2fsck's calls to quota functions in libsupport.a. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-05-30 05:36:43 +08:00
errcode_t retval;
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
quota_ctx_t qctx;
ext2_ino_t qf_ino;
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
enum quota_type qtype;
int enable = 0;
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
for (qtype = 0 ; qtype < MAXQUOTAS; qtype++)
if (quota_enable[qtype] != 0)
break;
if (qtype == MAXQUOTAS)
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
/* Nothing to do. */
return;
libsupport: fix gcc -Wall nits Also add better error checking to mke2fs and e2fsck's calls to quota functions in libsupport.a. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-05-30 05:36:43 +08:00
retval = quota_init_context(&qctx, fs, QUOTA_ALL_BIT);
if (retval) {
com_err(program_name, retval,
_("while initializing quota context in support library"));
exit(1);
}
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
for (qtype = 0 ; qtype < MAXQUOTAS; qtype++) {
if (quota_enable[qtype] == QOPT_ENABLE) {
enable = 1;
break;
}
tune2fs: preserve old limits when turn on quota feature When turn on quota by tune2fs, if the old quota file exist, the quota usage should be recomputed but the old limits should be preserved. Signed-off-by: Niu Yawei <niu@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-11-14 23:58:28 +08:00
}
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
if (enable)
quota_compute_usage(qctx);
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
for (qtype = 0 ; qtype < MAXQUOTAS; qtype++) {
if (quota_enable[qtype] == QOPT_ENABLE &&
*quota_sb_inump(fs->super, qtype) == 0) {
libsupport: fix gcc -Wall nits Also add better error checking to mke2fs and e2fsck's calls to quota functions in libsupport.a. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-05-30 05:36:43 +08:00
if ((qf_ino = quota_file_exists(fs, qtype)) > 0) {
retval = quota_update_limits(qctx, qf_ino,
qtype);
if (retval) {
com_err(program_name, retval,
_("while updating quota limits (%d)"),
qtype);
exit(1);
}
}
retval = quota_write_inode(qctx, 1 << qtype);
if (retval) {
com_err(program_name, retval,
_("while writing quota file (%d)"),
qtype);
exit(1);
}
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
} else if (quota_enable[qtype] == QOPT_DISABLE) {
libsupport: fix gcc -Wall nits Also add better error checking to mke2fs and e2fsck's calls to quota functions in libsupport.a. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-05-30 05:36:43 +08:00
retval = quota_remove_inode(fs, qtype);
if (retval) {
com_err(program_name, retval,
_("while removing quota file (%d)"),
qtype);
exit(1);
}
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
}
tune2fs: preserve old limits when turn on quota feature When turn on quota by tune2fs, if the old quota file exist, the quota usage should be recomputed but the old limits should be preserved. Signed-off-by: Niu Yawei <niu@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-11-14 23:58:28 +08:00
}
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
libquota: cleanup libquota code This patch cleans up the quota code as suggested in previous reviews. This includes * remove BUG_ON()s and 'exit()' calls from library code * remove calls to malloc/free and instead use ext2fs_get/free_mem functions. * lib/quota/common.c file in not needed anymore and is removed. * rename exported functions to start with quota_ (ex: init_quota_context --> quota_init_context) * better error handling in quota library Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-11-14 23:55:54 +08:00
quota_release_context(&qctx);
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
if (enable) {
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
ext2fs_set_feature_quota(fs->super);
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
ext2fs_mark_super_dirty(fs);
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
} else {
for (qtype = 0 ; qtype < MAXQUOTAS; qtype++)
if (*quota_sb_inump(fs->super, qtype) != 0)
break;
if (qtype == MAXQUOTAS) {
fs->super->s_feature_ro_compat &=
~EXT4_FEATURE_RO_COMPAT_QUOTA;
ext2fs_mark_super_dirty(fs);
}
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
}
return;
}
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
static int option_handle_function(char *token, void *data)
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
{
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
if (strncmp(token, "usr", 3) == 0) {
quota_enable[USRQUOTA] = QOPT_ENABLE;
} else if (strncmp(token, "^usr", 4) == 0) {
quota_enable[USRQUOTA] = QOPT_DISABLE;
} else if (strncmp(token, "grp", 3) == 0) {
quota_enable[GRPQUOTA] = QOPT_ENABLE;
} else if (strncmp(token, "^grp", 4) == 0) {
quota_enable[GRPQUOTA] = QOPT_DISABLE;
Add project quota support This patch adds project quota support. An new quota type PRJQUOTA(2) is added. EXT4_PRJ_QUOTA_INO(11) is reserved for project quota inode. The super block reservers an field s_prj_quota_inum for saving project quota inode. And each inode adds an internal field i_projid for saving its project ID. Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-01 11:57:05 +08:00
} else if (strncmp(token, "prj", 3) == 0) {
quota_enable[PRJQUOTA] = QOPT_ENABLE;
} else if (strncmp(token, "^prj", 4) == 0) {
quota_enable[PRJQUOTA] = QOPT_DISABLE;
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
} else {
fputs(_("\nBad quota options specified.\n\n"
"Following valid quota options are available "
"(pass by separating with comma):\n"
"\t[^]usr[quota]\n"
"\t[^]grp[quota]\n"
Add project quota support This patch adds project quota support. An new quota type PRJQUOTA(2) is added. EXT4_PRJ_QUOTA_INO(11) is reserved for project quota inode. The super block reservers an field s_prj_quota_inum for saving project quota inode. And each inode adds an internal field i_projid for saving its project ID. Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-01 11:57:05 +08:00
"\t[^]prj[quota]\n"
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
"\n\n"), stderr);
return 1;
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
}
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
return 0;
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
}
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
ChangeLog, e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: Fix gcc -Wall complaints, including one bug in tune2fs caused by a block automatic shadowing version of the variable we really wanted to use, which broke the logic testing to see if the filesystem was mounted. ChangeLog, MCONFIG.in: (gcc-wall-new): Added new target which forgoes the make clean so we only check the newly modified .c files.
2001-01-12 00:08:23 +08:00
static void parse_e2label_options(int argc, char ** argv)
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
{
if ((argc < 2) || (argc > 3)) {
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
fputs(_("Usage: e2label device [newlabel]\n"), stderr);
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
exit(1);
}
Add support for passing options to the io layer using the URL syntax. For example, /tmp/test.img?offset=1024. Multiple options can separated using the & character, although at the moment the only option implemented is the offset option in the unix_io layer.
2004-12-01 03:07:11 +08:00
io_options = strchr(argv[1], '?');
if (io_options)
*io_options++ = 0;
tune2fs.c (parse_tune2fs_options, parse_e2label_options): Allow the device name to be specified using LABEL=xxx or UUID=xxx, since we're including the blkid library anyway. (Addresses Debian bugs #166048, #179671)
2003-03-07 01:58:33 +08:00
device_name = blkid_get_devname(NULL, argv[1], NULL);
Check the returned name from blkid_get_devname in tune2fs and e2fsck, and print an error if the requested LABEL/UUID does not exist (previously, we core dumped!)
2003-11-21 22:10:29 +08:00
if (!device_name) {
Remove trailing whitespace for the entire source tree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-28 11:07:54 +08:00
com_err("e2label", 0, _("Unable to resolve '%s'"),
Check the returned name from blkid_get_devname in tune2fs and e2fsck, and print an error if the requested LABEL/UUID does not exist (previously, we core dumped!)
2003-11-21 22:10:29 +08:00
argv[1]);
exit(1);
}
mke2fs,tune2fs: Enable huge_file, dir_nlink, and extra_isize features Also change mke2fs.conf to enable huge_file,dir_nlink,extra_isize, and uninit_bg by default for ext4 filesystems, and enable extra_isize in the library as well. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-10 22:49:59 +08:00
open_flag = EXT2_FLAG_JOURNAL_DEV_OK;
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
if (argc == 3) {
Allow tune2fs to set and clear the test_fs flag on ext4 filesystems Also allow the label to be set/cleared on ext4 filesystems via e2label and tune2fs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-10 11:22:38 +08:00
open_flag |= EXT2_FLAG_RW;
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
L_flag = 1;
new_label = argv[2];
Remove trailing whitespace for the entire source tree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-28 11:07:54 +08:00
} else
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
print_label++;
}
tune2fs.8.in, tune2fs.c (parse_tune2fs_options, main): Add support for new option, -T, which allows the user to set the last checked time on the filesystem.
2001-12-26 21:58:01 +08:00
static time_t parse_time(char *str)
{
struct tm ts;
if (strcmp(str, "now") == 0) {
return (time(0));
}
memset(&ts, 0, sizeof(ts));
tune2fs.c (parse_time): Add portability code to work around lack of strptime().
2003-05-04 04:40:09 +08:00
#ifdef HAVE_STRPTIME
tune2fs.c (parse_time): Fix minor buglet; the parse_time routine should use the passed-in argument, not optarg, even though the two are the same in the case of the current caller of said function. (i.e., no user-visible problems were caused by this, even though the code was wrong).
2004-12-22 09:40:08 +08:00
strptime(str, "%Y%m%d%H%M%S", &ts);
tune2fs.c (parse_time): Add portability code to work around lack of strptime().
2003-05-04 04:40:09 +08:00
#else
tune2fs.c (parse_time): Fix minor buglet; the parse_time routine should use the passed-in argument, not optarg, even though the two are the same in the case of the current caller of said function. (i.e., no user-visible problems were caused by this, even though the code was wrong).
2004-12-22 09:40:08 +08:00
sscanf(str, "%4d%2d%2d%2d%2d%2d", &ts.tm_year, &ts.tm_mon,
tune2fs.c (parse_time): Add portability code to work around lack of strptime().
2003-05-04 04:40:09 +08:00
&ts.tm_mday, &ts.tm_hour, &ts.tm_min, &ts.tm_sec);
ts.tm_year -= 1900;
ts.tm_mon -= 1;
if (ts.tm_year < 0 || ts.tm_mon < 0 || ts.tm_mon > 11 ||
ts.tm_mday < 0 || ts.tm_mday > 31 || ts.tm_hour > 23 ||
ts.tm_min > 59 || ts.tm_sec > 61)
ts.tm_mday = 0;
#endif
tune2fs.8.in, tune2fs.c (parse_tune2fs_options, main): Add support for new option, -T, which allows the user to set the last checked time on the filesystem.
2001-12-26 21:58:01 +08:00
if (ts.tm_mday == 0) {
com_err(program_name, 0,
_("Couldn't parse date/time specifier: %s"),
str);
usage();
}
debugfs, tune2fs: Handle daylight savings time when parsing a time string We need to set tm_isdst to -1 so that mktime will automatically determine whether or not daylight savings time (DST) is in effect. Previously tm_isdst was set to 0, which caused mktime to interpret the time as if it was always not using DST. Addresses-Debian-Bug: #471882 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-03-21 21:10:09 +08:00
ts.tm_isdst = -1;
tune2fs.8.in, tune2fs.c (parse_tune2fs_options, main): Add support for new option, -T, which allows the user to set the last checked time on the filesystem.
2001-12-26 21:58:01 +08:00
return (mktime(&ts));
}
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
ChangeLog, e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: Fix gcc -Wall complaints, including one bug in tune2fs caused by a block automatic shadowing version of the variable we really wanted to use, which broke the logic testing to see if the filesystem was mounted. ChangeLog, MCONFIG.in: (gcc-wall-new): Added new target which forgoes the make clean so we only check the newly modified .c files.
2001-01-12 00:08:23 +08:00
static void parse_tune2fs_options(int argc, char **argv)
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
{
Many files: fsck.c: chattr.c: Remove #include of getopt.h, since it's not needed. tune2fs.c (main): lsattr.c (main): badblocks.c (main): dumpe2fs.c (main): mke2fs.c (PRS): Make the variable which getopt returns into be an int, so that it won't lose on platforms where char is unsigned. ChangeLog, unix.c: Make the variable which getopt returns into be an int, so that it won't lose on platforms where char is unsigned.
1997-10-25 11:49:49 +08:00
int c;
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
char *tmp;
struct group *gr;
struct passwd *pw;
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
int ret;
configure: remove support to disable quota support For the 1.43 release, quota support will be the default. It's much simpler if we don't try to make quota support optional. This was done originally because the quota feature wasn't fully tested. It is now, so we can remove this as an option. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-07-04 10:02:30 +08:00
char optstring[100] = "c:e:fg:i:jlm:o:r:s:u:C:E:I:J:L:M:O:T:U:z:Q:";
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
mke2fs,tune2fs: Enable huge_file, dir_nlink, and extra_isize features Also change mke2fs.conf to enable huge_file,dir_nlink,extra_isize, and uninit_bg by default for ext4 filesystems, and enable extra_isize in the library as well. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-10 22:49:59 +08:00
open_flag = 0;
Remove EXT2FS_VERSION from the version display, since it only confuses people. Make fsck's version display be consistent with the other e2fsprogs programs.
2001-08-28 00:44:23 +08:00
printf("tune2fs %s (%s)\n", E2FSPROGS_VERSION, E2FSPROGS_DATE);
tune2fs: more respect for quota config option Commit 44a2cca3 disabled tune2fs -O quota when the build didn't have --enable-quota at configure time, but that wasn't quite enough. We need to exclude the "-Q" option as well from tune2fs when --enable-quota isn't specified at configure time. Otherwise, tune2fs -Q can set the quota feature, but no other utility will touch the filesystem due to the unknown flag, if buitl w/o --enable-quota. So put everything related to "-Q" under #ifdef CONFIG_QUOTA; usage output (was missing before) and option parsing. Addresses-Red-Hat-Bugzilla: #1010709 Reported-by: Bert DeKnuydt <Bert.Deknuydt@esat.kuleuven.be> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-14 21:03:06 +08:00
while ((c = getopt(argc, argv, optstring)) != EOF)
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
switch (c) {
case 'c':
max_mount_count = strtol(optarg, &tmp, 0);
if (*tmp || max_mount_count > 16000) {
com_err(program_name, 0,
_("bad mounts count - %s"),
optarg);
usage();
}
if (max_mount_count == 0)
max_mount_count = -1;
c_flag = 1;
open_flag = EXT2_FLAG_RW;
break;
case 'C':
mount_count = strtoul(optarg, &tmp, 0);
if (*tmp || mount_count > 16000) {
com_err(program_name, 0,
_("bad mounts count - %s"),
optarg);
usage();
}
C_flag = 1;
open_flag = EXT2_FLAG_RW;
break;
case 'e':
if (strcmp(optarg, "continue") == 0)
errors = EXT2_ERRORS_CONTINUE;
else if (strcmp(optarg, "remount-ro") == 0)
errors = EXT2_ERRORS_RO;
else if (strcmp(optarg, "panic") == 0)
errors = EXT2_ERRORS_PANIC;
else {
com_err(program_name, 0,
_("bad error behavior - %s"),
optarg);
usage();
}
e_flag = 1;
open_flag = EXT2_FLAG_RW;
break;
case 'E':
extended_cmd = optarg;
open_flag |= EXT2_FLAG_RW;
break;
case 'f': /* Force */
tune2fs: allow removal of dirty journal with two "-f" options Jim pointed out that "tune2fs -f -O ^has_journal" won't remove the journal if the needs_recovery flag is set; the manpage seems to indicate that it should. And if you've lost an external journal and can no longer replay it, how should one proceed? Change tune2fs so that two "-f" options will allow removal of a dirty journal from a filesystem, even if the filesystem needs recovery. e2fsck can then do its best to pick up the pieces. Addresses-Debian-Bug: #559301 Reported-by: Jim Faulkner <james.faulkner@yale.edu> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2014-02-21 09:18:41 +08:00
f_flag++;
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
break;
case 'g':
resgid = strtoul(optarg, &tmp, 0);
if (*tmp) {
gr = getgrnam(optarg);
if (gr == NULL)
tmp = optarg;
ChangeLog, debugfs.8.in, debugfs.c: Add a -V option which displays the current version. ChangeLog, unix.c: unix.c (e2fsck_update_progress): Remove unused variables. ChangeLog, inode.c: inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup() is called early because of a missing inode table in a block group, the current_inode counter wasn't incremented correctly. ChangeLog, tst_uuid.c: tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter. ChangeLog, test_icount.c: test_icount.c (main): Fix main() declaration so that it returns int, not void. Many files: fsck.c (ignore): Remove unused variable cp. chattr.c (fatal_error): tune2fs.c (usage): lsattr.c (usage): dumpe2fs.c (usage): badblocks.c (usage): Remove volatile from declaration. fsck.c: Change use of strdup to be string_copy, since we don't trust what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 13:11:14 +08:00
else {
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
resgid = gr->gr_gid;
*tmp = 0;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
}
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
}
if (*tmp) {
com_err(program_name, 0,
_("bad gid/group name - %s"),
optarg);
usage();
}
g_flag = 1;
open_flag = EXT2_FLAG_RW;
break;
case 'i':
interval = strtoul(optarg, &tmp, 0);
switch (*tmp) {
case 's':
tmp++;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
break;
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
case '\0':
case 'd':
case 'D': /* days */
interval *= 86400;
if (*tmp != '\0')
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
tmp++;
break;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
case 'm':
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
case 'M': /* months! */
interval *= 86400 * 30;
tmp++;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
break;
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
case 'w':
case 'W': /* weeks */
interval *= 86400 * 7;
tmp++;
Add support for new feature in ext2/3 filesystems; a default mount options field in the superblock. Added the tune2fs '-o' option to set this field.
2002-10-16 05:43:43 +08:00
break;
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
}
if (*tmp) {
com_err(program_name, 0,
_("bad interval - %s"), optarg);
usage();
}
i_flag = 1;
open_flag = EXT2_FLAG_RW;
break;
case 'j':
if (!journal_size)
journal_size = -1;
open_flag = EXT2_FLAG_RW;
break;
case 'J':
parse_journal_opts(optarg);
open_flag = EXT2_FLAG_RW;
break;
case 'l':
l_flag = 1;
break;
case 'L':
new_label = optarg;
L_flag = 1;
open_flag |= EXT2_FLAG_RW |
EXT2_FLAG_JOURNAL_DEV_OK;
break;
case 'm':
reserved_ratio = strtod(optarg, &tmp);
mke2fs, tune2fs: Do not allow the reserved_ratio to be negative Add a check to make sure the argument to the -m option (which specifies the reserved ratio) is greater than zero. Addresses-Debian-Bug: #517015 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-03-06 15:23:59 +08:00
if (*tmp || reserved_ratio > 50 ||
reserved_ratio < 0) {
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
com_err(program_name, 0,
_("bad reserved block ratio - %s"),
optarg);
usage();
}
m_flag = 1;
open_flag = EXT2_FLAG_RW;
break;
case 'M':
new_last_mounted = optarg;
M_flag = 1;
open_flag = EXT2_FLAG_RW;
break;
case 'o':
if (mntopts_cmd) {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
com_err(program_name, 0, "%s",
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
_("-o may only be specified once"));
usage();
}
mntopts_cmd = optarg;
open_flag = EXT2_FLAG_RW;
break;
case 'O':
if (features_cmd) {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
com_err(program_name, 0, "%s",
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
_("-O may only be specified once"));
usage();
}
features_cmd = optarg;
open_flag = EXT2_FLAG_RW;
break;
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
case 'Q':
Q_flag = 1;
Clean up codes for adding new quota type Project quota related fields are reserved in Linux kernel. As a preparation for it, this patch cleans up quota codes of e2fsprogs so as to make it easier to add new quota type(s). Signed-off-by: Li Xi <lixi@ddn.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-01-12 16:56:44 +08:00
ret = parse_quota_opts(optarg, option_handle_function,
NULL);
if (ret)
exit(1);
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
open_flag = EXT2_FLAG_RW;
break;
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
case 'r':
reserved_blocks = strtoul(optarg, &tmp, 0);
if (*tmp) {
com_err(program_name, 0,
_("bad reserved blocks count - %s"),
optarg);
usage();
}
r_flag = 1;
open_flag = EXT2_FLAG_RW;
break;
case 's': /* Deprecated */
s_flag = atoi(optarg);
open_flag = EXT2_FLAG_RW;
break;
case 'T':
T_flag = 1;
last_check_time = parse_time(optarg);
open_flag = EXT2_FLAG_RW;
break;
case 'u':
resuid = strtoul(optarg, &tmp, 0);
ChangeLog, debugfs.8.in, debugfs.c: Add a -V option which displays the current version. ChangeLog, unix.c: unix.c (e2fsck_update_progress): Remove unused variables. ChangeLog, inode.c: inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup() is called early because of a missing inode table in a block group, the current_inode counter wasn't incremented correctly. ChangeLog, tst_uuid.c: tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter. ChangeLog, test_icount.c: test_icount.c (main): Fix main() declaration so that it returns int, not void. Many files: fsck.c (ignore): Remove unused variable cp. chattr.c (fatal_error): tune2fs.c (usage): lsattr.c (usage): dumpe2fs.c (usage): badblocks.c (usage): Remove volatile from declaration. fsck.c: Change use of strdup to be string_copy, since we don't trust what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 13:11:14 +08:00
if (*tmp) {
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
pw = getpwnam(optarg);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
if (pw == NULL)
tmp = optarg;
Many files: Checked in e2fsprogs 0.5c
1997-04-26 22:00:26 +08:00
else {
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
resuid = pw->pw_uid;
Many files: Checked in e2fsprogs 0.5c
1997-04-26 22:00:26 +08:00
*tmp = 0;
}
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
}
ChangeLog, debugfs.8.in, debugfs.c: Add a -V option which displays the current version. ChangeLog, unix.c: unix.c (e2fsck_update_progress): Remove unused variables. ChangeLog, inode.c: inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup() is called early because of a missing inode table in a block group, the current_inode counter wasn't incremented correctly. ChangeLog, tst_uuid.c: tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter. ChangeLog, test_icount.c: test_icount.c (main): Fix main() declaration so that it returns int, not void. Many files: fsck.c (ignore): Remove unused variable cp. chattr.c (fatal_error): tune2fs.c (usage): lsattr.c (usage): dumpe2fs.c (usage): badblocks.c (usage): Remove volatile from declaration. fsck.c: Change use of strdup to be string_copy, since we don't trust what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 13:11:14 +08:00
if (*tmp) {
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
com_err(program_name, 0,
_("bad uid/user name - %s"),
optarg);
ChangeLog, debugfs.8.in, debugfs.c: Add a -V option which displays the current version. ChangeLog, unix.c: unix.c (e2fsck_update_progress): Remove unused variables. ChangeLog, inode.c: inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup() is called early because of a missing inode table in a block group, the current_inode counter wasn't incremented correctly. ChangeLog, tst_uuid.c: tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter. ChangeLog, test_icount.c: test_icount.c (main): Fix main() declaration so that it returns int, not void. Many files: fsck.c (ignore): Remove unused variable cp. chattr.c (fatal_error): tune2fs.c (usage): lsattr.c (usage): dumpe2fs.c (usage): badblocks.c (usage): Remove volatile from declaration. fsck.c: Change use of strdup to be string_copy, since we don't trust what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 13:11:14 +08:00
usage();
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
}
u_flag = 1;
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
open_flag = EXT2_FLAG_RW;
break;
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
case 'U':
new_UUID = optarg;
U_flag = 1;
open_flag = EXT2_FLAG_RW |
EXT2_FLAG_JOURNAL_DEV_OK;
break;
case 'I':
new_inode_size = strtoul(optarg, &tmp, 0);
if (*tmp) {
com_err(program_name, 0,
_("bad inode size - %s"),
optarg);
ChangeLog, debugfs.8.in, debugfs.c: Add a -V option which displays the current version. ChangeLog, unix.c: unix.c (e2fsck_update_progress): Remove unused variables. ChangeLog, inode.c: inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup() is called early because of a missing inode table in a block group, the current_inode counter wasn't incremented correctly. ChangeLog, tst_uuid.c: tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter. ChangeLog, test_icount.c: test_icount.c (main): Fix main() declaration so that it returns int, not void. Many files: fsck.c (ignore): Remove unused variable cp. chattr.c (fatal_error): tune2fs.c (usage): lsattr.c (usage): dumpe2fs.c (usage): badblocks.c (usage): Remove volatile from declaration. fsck.c: Change use of strdup to be string_copy, since we don't trust what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 13:11:14 +08:00
usage();
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
}
if (!((new_inode_size &
(new_inode_size - 1)) == 0)) {
com_err(program_name, 0,
_("Inode size must be a "
"power of two- %s"),
optarg);
usage();
}
open_flag = EXT2_FLAG_RW;
I_flag = 1;
break;
tune2fs: optionally create undo file Provide the user with an option to create an undo file so that they can roll back a failed tuning operation. Previously, one would be created for inode resize if a bunch of (undocumented) conditions were met. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-05 22:41:08 +08:00
case 'z':
undo_file = optarg;
break;
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
default:
usage();
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
}
if (optind < argc - 1 || optind == argc)
ChangeLog, debugfs.8.in, debugfs.c: Add a -V option which displays the current version. ChangeLog, unix.c: unix.c (e2fsck_update_progress): Remove unused variables. ChangeLog, inode.c: inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup() is called early because of a missing inode table in a block group, the current_inode counter wasn't incremented correctly. ChangeLog, tst_uuid.c: tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter. ChangeLog, test_icount.c: test_icount.c (main): Fix main() declaration so that it returns int, not void. Many files: fsck.c (ignore): Remove unused variable cp. chattr.c (fatal_error): tune2fs.c (usage): lsattr.c (usage): dumpe2fs.c (usage): badblocks.c (usage): Remove volatile from declaration. fsck.c: Change use of strdup to be string_copy, since we don't trust what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 13:11:14 +08:00
usage();
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
if (!open_flag && !l_flag)
usage();
Add support for passing options to the io layer using the URL syntax. For example, /tmp/test.img?offset=1024. Multiple options can separated using the & character, although at the moment the only option implemented is the offset option in the unix_io layer.
2004-12-01 03:07:11 +08:00
io_options = strchr(argv[optind], '?');
if (io_options)
*io_options++ = 0;
tune2fs.c (parse_tune2fs_options, parse_e2label_options): Allow the device name to be specified using LABEL=xxx or UUID=xxx, since we're including the blkid library anyway. (Addresses Debian bugs #166048, #179671)
2003-03-07 01:58:33 +08:00
device_name = blkid_get_devname(NULL, argv[optind], NULL);
Check the returned name from blkid_get_devname in tune2fs and e2fsck, and print an error if the requested LABEL/UUID does not exist (previously, we core dumped!)
2003-11-21 22:10:29 +08:00
if (!device_name) {
Fix gcc -Wall nits This fixes the last set of gcc -Wall complaints. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-01-02 02:28:27 +08:00
com_err(program_name, 0, _("Unable to resolve '%s'"),
Check the returned name from blkid_get_devname in tune2fs and e2fsck, and print an error if the requested LABEL/UUID does not exist (previously, we core dumped!)
2003-11-21 22:10:29 +08:00
argv[optind]);
exit(1);
}
Add support for searching /proc/evms/volumes when interpreting LABEL=xxx or UUID=xxx. Add new utility program /sbin/findfs, which interprets LABEL=xxx or UUID=xxx, and returns the device name. (Part of tune2fs).
2002-08-18 11:01:22 +08:00
}
configure.in: add --disable-libblkid option Add an option to switch between the private (in-tree) libblkid and public (in-system installed) library. The private version is still enabled by default. If --disable-libblkid is specified the findfs(8) program, which is a variant of tune2fs, is also not built or installed. Signed-off-by: Karel Zak <kzak@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-04-22 21:18:30 +08:00
#ifdef CONFIG_BUILD_FINDFS
Fix gcc -Wall nits. Fix format bug if NLS is in use. Add extra so that the info directory looks OK on OpenWall.
2002-10-14 11:56:28 +08:00
void do_findfs(int argc, char **argv)
Add support for searching /proc/evms/volumes when interpreting LABEL=xxx or UUID=xxx. Add new utility program /sbin/findfs, which interprets LABEL=xxx or UUID=xxx, and returns the device name. (Part of tune2fs).
2002-08-18 11:01:22 +08:00
{
char *dev;
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
Add support for searching /proc/evms/volumes when interpreting LABEL=xxx or UUID=xxx. Add new utility program /sbin/findfs, which interprets LABEL=xxx or UUID=xxx, and returns the device name. (Part of tune2fs).
2002-08-18 11:01:22 +08:00
if ((argc != 2) ||
(strncmp(argv[1], "LABEL=", 6) && strncmp(argv[1], "UUID=", 5))) {
fprintf(stderr, "Usage: findfs LABEL=<label>|UUID=<uuid>\n");
exit(2);
}
Minor bug fixes in the blkid library. Convert mke2fs, fsck, and tune2fs to use the blkid library.
2003-03-02 08:29:01 +08:00
dev = blkid_get_devname(NULL, argv[1], NULL);
Add support for searching /proc/evms/volumes when interpreting LABEL=xxx or UUID=xxx. Add new utility program /sbin/findfs, which interprets LABEL=xxx or UUID=xxx, and returns the device name. (Part of tune2fs).
2002-08-18 11:01:22 +08:00
if (!dev) {
Remove trailing whitespace for the entire source tree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-28 11:07:54 +08:00
com_err("findfs", 0, _("Unable to resolve '%s'"),
Add support for searching /proc/evms/volumes when interpreting LABEL=xxx or UUID=xxx. Add new utility program /sbin/findfs, which interprets LABEL=xxx or UUID=xxx, and returns the device name. (Part of tune2fs).
2002-08-18 11:01:22 +08:00
argv[1]);
exit(1);
}
puts(dev);
exit(0);
}
configure.in: add --disable-libblkid option Add an option to switch between the private (in-tree) libblkid and public (in-system installed) library. The private version is still enabled by default. If --disable-libblkid is specified the findfs(8) program, which is a variant of tune2fs, is also not built or installed. Signed-off-by: Karel Zak <kzak@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-04-22 21:18:30 +08:00
#endif
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
static int parse_extended_opts(ext2_filsys fs, const char *opts)
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
{
char *buf, *token, *next, *p, *arg;
tune2fs: Add support for setting the default hash algorithm for htree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-30 09:21:19 +08:00
int len, hash_alg;
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
int r_usage = 0;
len = strlen(opts);
buf = malloc(len+1);
if (!buf) {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
fprintf(stderr, "%s",
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
_("Couldn't allocate memory to parse options!\n"));
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 1;
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
}
strcpy(buf, opts);
for (token = buf; token && *token; token = next) {
p = strchr(token, ',');
next = 0;
if (p) {
*p = 0;
next = p+1;
}
arg = strchr(token, '=');
if (arg) {
*arg = 0;
arg++;
}
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
if (strcmp(token, "clear-mmp") == 0 ||
strcmp(token, "clear_mmp") == 0) {
clear_mmp = 1;
} else if (strcmp(token, "mmp_update_interval") == 0) {
misc: fix gcc -Wall warnings Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-05-20 08:03:48 +08:00
unsigned long intv;
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
if (!arg) {
r_usage++;
continue;
}
misc: fix gcc -Wall warnings Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-05-20 08:03:48 +08:00
intv = strtoul(arg, &p, 0);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
if (*p) {
fprintf(stderr,
_("Invalid mmp_update_interval: %s\n"),
arg);
r_usage++;
continue;
}
misc: fix gcc -Wall warnings Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-05-20 08:03:48 +08:00
if (intv == 0) {
intv = EXT4_MMP_UPDATE_INTERVAL;
} else if (intv > EXT4_MMP_MAX_UPDATE_INTERVAL) {
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
fprintf(stderr,
_("mmp_update_interval too big: %lu\n"),
misc: fix gcc -Wall warnings Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-05-20 08:03:48 +08:00
intv);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
r_usage++;
continue;
}
Fix more spelling errors found by translators and add pluralization Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-10-10 05:08:47 +08:00
printf(P_("Setting multiple mount protection update "
"interval to %lu second\n",
"Setting multiple mount protection update "
misc: fix gcc -Wall warnings Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-05-20 08:03:48 +08:00
"interval to %lu seconds\n", intv),
intv);
fs->super->s_mmp_update_interval = intv;
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
ext2fs_mark_super_dirty(fs);
} else if (!strcmp(token, "test_fs")) {
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
fs->super->s_flags |= EXT2_FLAGS_TEST_FILESYS;
printf("Setting test filesystem flag\n");
ext2fs_mark_super_dirty(fs);
} else if (!strcmp(token, "^test_fs")) {
fs->super->s_flags &= ~EXT2_FLAGS_TEST_FILESYS;
printf("Clearing test filesystem flag\n");
ext2fs_mark_super_dirty(fs);
Add support for setting RAID stride and strip-width via mke2fs and tune2fs This is useful for mballoc to align block allocation on the RAID stripe boundaries. Signed-off-by: Rupesh Thakare <rupesh@clusterfs.com> Signed-off-by: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-19 11:56:25 +08:00
} else if (strcmp(token, "stride") == 0) {
if (!arg) {
r_usage++;
continue;
}
stride = strtoul(arg, &p, 0);
tune2fs: allow setting the stride and stripe width to zero Tune2fs previously would give an error if the user tried setting the stride and stripe-width parameters to zero; but this is necessary to disable the stride and stripe-width settings. So allow setting these superblock fields to zero. Addresses-Google-Bug: #4988557 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-07-05 07:37:11 +08:00
if (*p) {
Add support for setting RAID stride and strip-width via mke2fs and tune2fs This is useful for mballoc to align block allocation on the RAID stripe boundaries. Signed-off-by: Rupesh Thakare <rupesh@clusterfs.com> Signed-off-by: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-19 11:56:25 +08:00
fprintf(stderr,
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
_("Invalid RAID stride: %s\n"),
Add support for setting RAID stride and strip-width via mke2fs and tune2fs This is useful for mballoc to align block allocation on the RAID stripe boundaries. Signed-off-by: Rupesh Thakare <rupesh@clusterfs.com> Signed-off-by: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-19 11:56:25 +08:00
arg);
r_usage++;
continue;
}
stride_set = 1;
} else if (strcmp(token, "stripe-width") == 0 ||
strcmp(token, "stripe_width") == 0) {
if (!arg) {
r_usage++;
continue;
}
stripe_width = strtoul(arg, &p, 0);
tune2fs: allow setting the stride and stripe width to zero Tune2fs previously would give an error if the user tried setting the stride and stripe-width parameters to zero; but this is necessary to disable the stride and stripe-width settings. So allow setting these superblock fields to zero. Addresses-Google-Bug: #4988557 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-07-05 07:37:11 +08:00
if (*p) {
Add support for setting RAID stride and strip-width via mke2fs and tune2fs This is useful for mballoc to align block allocation on the RAID stripe boundaries. Signed-off-by: Rupesh Thakare <rupesh@clusterfs.com> Signed-off-by: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-19 11:56:25 +08:00
fprintf(stderr,
_("Invalid RAID stripe-width: %s\n"),
arg);
r_usage++;
continue;
}
stripe_width_set = 1;
tune2fs: Add support for setting the default hash algorithm for htree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-30 09:21:19 +08:00
} else if (strcmp(token, "hash_alg") == 0 ||
strcmp(token, "hash-alg") == 0) {
if (!arg) {
r_usage++;
continue;
}
hash_alg = e2p_string2hash(arg);
if (hash_alg < 0) {
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
fprintf(stderr,
tune2fs: Add support for setting the default hash algorithm for htree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-30 09:21:19 +08:00
_("Invalid hash algorithm: %s\n"),
arg);
r_usage++;
continue;
}
fs->super->s_def_hash_version = hash_alg;
printf(_("Setting default hash algorithm "
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
"to %s (%d)\n"),
tune2fs: Add support for setting the default hash algorithm for htree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-30 09:21:19 +08:00
arg, hash_alg);
ext2fs_mark_super_dirty(fs);
tune2fs: Fix mount_opts handling The extended options parsing for mount_opts was horribly buggy. Invalid mount options that had an argument would get interpreted as an extended mount options. Fix this. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-07-05 08:14:35 +08:00
} else if (!strcmp(token, "mount_opts")) {
tune2fs, debugfs, libext2fs: Add support for ext4 default mount options Add support for 2.6.35's new default mount options which can be specified in the superblock. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-09-19 07:38:22 +08:00
if (!arg) {
r_usage++;
continue;
}
if (strlen(arg) >= sizeof(fs->super->s_mount_opts)) {
fprintf(stderr,
"Extended mount options too long\n");
continue;
}
tune2fs: Fix mount_opts handling The extended options parsing for mount_opts was horribly buggy. Invalid mount options that had an argument would get interpreted as an extended mount options. Fix this. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-07-05 08:14:35 +08:00
ext_mount_opts = strdup(arg);
Remove trailing whitespace for the entire source tree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-28 11:07:54 +08:00
} else
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
r_usage++;
}
if (r_usage) {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
fprintf(stderr, "%s", _("\nBad options specified.\n\n"
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
"Extended options are separated by commas, "
"and may take an argument which\n"
"\tis set off by an equals ('=') sign.\n\n"
"Valid extended options are:\n"
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
"\tclear_mmp\n"
tune2fs: Fix mount_opts handling The extended options parsing for mount_opts was horribly buggy. Invalid mount options that had an argument would get interpreted as an extended mount options. Fix this. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-07-05 08:14:35 +08:00
"\thash_alg=<hash algorithm>\n"
"\tmount_opts=<extended default mount options>\n"
Add support for setting RAID stride and strip-width via mke2fs and tune2fs This is useful for mballoc to align block allocation on the RAID stripe boundaries. Signed-off-by: Rupesh Thakare <rupesh@clusterfs.com> Signed-off-by: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-19 11:56:25 +08:00
"\tstride=<RAID per-disk chunk size in blocks>\n"
tune2fs: Add support for setting the default hash algorithm for htree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-30 09:21:19 +08:00
"\tstripe_width=<RAID stride*data disks in blocks>\n"
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
"\ttest_fs\n"
"\t^test_fs\n"));
free(buf);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 1;
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
}
free(buf);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
return 0;
Remove trailing whitespace for the entire source tree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-28 11:07:54 +08:00
}
Add support for the test_fs flag The test_fs flag is an "ok to be used with test kernel code" flag. It makes it easier for us to determine whether a filesystem should be mounted using ext4 or not. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-01-27 08:06:35 +08:00
tune2fs: Fix tune2fs -I so it won't corrupt RAID filesystems If a filesystem is built with the stride extended-option (which is often used in RAID filesystems to make sure the block and inode allocation bitmaps don't end up hitting one disk platter harder than the rest), this can cause tune2fs -I to corrupt the filesystem because it fails to handle the case where the allocation bitmaps are located after the inode table, where the inode table needs to grow. Handle this case correctly. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-21 00:49:17 +08:00
/*
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
* Fill in the block bitmap bmap with the information regarding the
* blocks to be moved
tune2fs: Fix tune2fs -I so it won't corrupt RAID filesystems If a filesystem is built with the stride extended-option (which is often used in RAID filesystems to make sure the block and inode allocation bitmaps don't end up hitting one disk platter harder than the rest), this can cause tune2fs -I to corrupt the filesystem because it fails to handle the case where the allocation bitmaps are located after the inode table, where the inode table needs to grow. Handle this case correctly. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-21 00:49:17 +08:00
*/
static int get_move_bitmaps(ext2_filsys fs, int new_ino_blks_per_grp,
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
ext2fs_block_bitmap bmap)
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
{
dgrp_t i;
tune2fs: handle bad blocks when resizing inodes When increasing inode size if we find that the new block that we needed to increase the inode table size is a bad block we fail. This make sure we don't end up with a corrupt file system when doing inode resize on a file system having bad blocks. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:31 +08:00
int retval;
ext2_badblocks_list bb_list = 0;
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
blk64_t j, needed_blocks = 0;
blk64_t start_blk, end_blk;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
tune2fs: handle bad blocks when resizing inodes When increasing inode size if we find that the new block that we needed to increase the inode table size is a bad block we fail. This make sure we don't end up with a corrupt file system when doing inode resize on a file system having bad blocks. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:31 +08:00
retval = ext2fs_read_bb_inode(fs, &bb_list);
if (retval)
return retval;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
for (i = 0; i < fs->group_desc_count; i++) {
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
start_blk = ext2fs_inode_table_loc(fs, i) +
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
fs->inode_blocks_per_group;
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
end_blk = ext2fs_inode_table_loc(fs, i) +
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
new_ino_blks_per_grp;
for (j = start_blk; j < end_blk; j++) {
Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-23 09:15:30 +08:00
if (ext2fs_test_block_bitmap2(fs->block_map, j)) {
tune2fs: handle bad blocks when resizing inodes When increasing inode size if we find that the new block that we needed to increase the inode table size is a bad block we fail. This make sure we don't end up with a corrupt file system when doing inode resize on a file system having bad blocks. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:31 +08:00
/*
* IF the block is a bad block we fail
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
*/
tune2fs: handle bad blocks when resizing inodes When increasing inode size if we find that the new block that we needed to increase the inode table size is a bad block we fail. This make sure we don't end up with a corrupt file system when doing inode resize on a file system having bad blocks. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:31 +08:00
if (ext2fs_badblocks_list_test(bb_list, j)) {
ext2fs_badblocks_list_free(bb_list);
return ENOSPC;
}
Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-23 09:15:30 +08:00
ext2fs_mark_block_bitmap2(bmap, j);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
} else {
/*
* We are going to use this block for
* inode table. So mark them used.
*/
Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-23 09:15:30 +08:00
ext2fs_mark_block_bitmap2(fs->block_map, j);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
}
}
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
needed_blocks += end_blk - start_blk;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
}
tune2fs: handle bad blocks when resizing inodes When increasing inode size if we find that the new block that we needed to increase the inode table size is a bad block we fail. This make sure we don't end up with a corrupt file system when doing inode resize on a file system having bad blocks. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:31 +08:00
ext2fs_badblocks_list_free(bb_list);
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 08:46:34 +08:00
if (needed_blocks > ext2fs_free_blocks_count(fs->super))
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
return ENOSPC;
return 0;
}
e2fsprogs: fix blk_t <- blk64_t assignment mismatches Fix all the places where we should be using a blk64_t instead of a blk_t. These fixes are more severe because 64bit values could be truncated silently. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-07 21:51:48 +08:00
static int ext2fs_is_meta_block(ext2_filsys fs, blk64_t blk)
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
{
dgrp_t group;
e2fsprogs: fix blk_t <- blk64_t assignment mismatches Fix all the places where we should be using a blk64_t instead of a blk_t. These fixes are more severe because 64bit values could be truncated silently. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-07 21:51:48 +08:00
group = ext2fs_group_of_blk2(fs, blk);
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
if (ext2fs_block_bitmap_loc(fs, group) == blk)
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
return 1;
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
if (ext2fs_inode_bitmap_loc(fs, group) == blk)
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
return 1;
return 0;
}
e2fsprogs: fix blk_t <- blk64_t assignment mismatches Fix all the places where we should be using a blk64_t instead of a blk_t. These fixes are more severe because 64bit values could be truncated silently. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-07 21:51:48 +08:00
static int ext2fs_is_block_in_group(ext2_filsys fs, dgrp_t group, blk64_t blk)
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
{
e2fsprogs: fix blk_t <- blk64_t assignment mismatches Fix all the places where we should be using a blk64_t instead of a blk_t. These fixes are more severe because 64bit values could be truncated silently. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-07 21:51:48 +08:00
blk64_t start_blk, end_blk;
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
start_blk = fs->super->s_first_data_block +
Fix 32/64-bit overflow when multiplying by blocks/clusters per group There are a number of places where we need convert groups to blocks or clusters by multiply the groups by blocks/clusters per group. Unfortunately, both quantities are 32-bit, but the result needs to be 64-bit, and very often the cast to 64-bit gets lost. Fix this by adding new macros, EXT2_GROUPS_TO_BLOCKS() and EXT2_GROUPS_TO_CLUSTERS(). This should fix a bug where resizing a 64bit file system can result in calculate_minimum_resize_size() looping forever. Addresses-Launchpad-Bug: #1321958 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-26 19:40:36 +08:00
EXT2_GROUPS_TO_BLOCKS(fs->super, group);
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
/*
* We cannot get new block beyond end_blk for for the last block group
* so we can check with EXT2_BLOCKS_PER_GROUP even for last block group
*/
end_blk = start_blk + EXT2_BLOCKS_PER_GROUP(fs->super);
if (blk >= start_blk && blk <= end_blk)
return 1;
return 0;
}
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
static int move_block(ext2_filsys fs, ext2fs_block_bitmap bmap)
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
{
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
char *buf;
misc: clean up compiler warnings Fix several types of compiler warnings (unused variables/labels), uninitialized variables, etc that are hit with gcc -Wall. Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-06-11 22:58:25 +08:00
dgrp_t group = 0;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
errcode_t retval;
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
int meta_data = 0;
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
blk64_t blk, new_blk, goal;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
struct blk_move *bmv;
retval = ext2fs_get_mem(fs->blocksize, &buf);
if (retval)
return retval;
tune2fs: Fix inefficient O(n**2) algorithms when expanding the inode size When running "tune2fs -I 256" on moderate to large filesystems, the time required to run tune2fs can take many hours (20+ before some users gave up in disgust). This was due to some O(n**2) and O(n*m) algorithms in move_block() and inode_scan_and_fix(), respectively. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-11-15 13:32:39 +08:00
for (new_blk = blk = fs->super->s_first_data_block;
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 08:46:34 +08:00
blk < ext2fs_blocks_count(fs->super); blk++) {
Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-23 09:15:30 +08:00
if (!ext2fs_test_block_bitmap2(bmap, blk))
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
continue;
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
if (ext2fs_is_meta_block(fs, blk)) {
/*
* If the block is mapping a fs meta data block
* like group desc/block bitmap/inode bitmap. We
* should find a block in the same group and fix
* the respective fs metadata pointers. Otherwise
* fail
*/
e2fsprogs: fix blk_t <- blk64_t assignment mismatches Fix all the places where we should be using a blk64_t instead of a blk_t. These fixes are more severe because 64bit values could be truncated silently. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-07 21:51:48 +08:00
group = ext2fs_group_of_blk2(fs, blk);
Convert ext2fs_group_{first,last}_block() to *block2() Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:24:06 +08:00
goal = ext2fs_group_first_block2(fs, group);
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
meta_data = 1;
} else {
goal = new_blk;
}
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
retval = ext2fs_new_block2(fs, goal, NULL, &new_blk);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
if (retval)
goto err_out;
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
/* new fs meta data block should be in the same group */
if (meta_data && !ext2fs_is_block_in_group(fs, group, new_blk)) {
retval = ENOSPC;
goto err_out;
}
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
/* Mark this block as allocated */
Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-23 09:15:30 +08:00
ext2fs_mark_block_bitmap2(fs->block_map, new_blk);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
/* Add it to block move list */
retval = ext2fs_get_mem(sizeof(struct blk_move), &bmv);
if (retval)
goto err_out;
bmv->old_loc = blk;
bmv->new_loc = new_blk;
list_add(&(bmv->list), &blk_move_list);
Convert to use io_channel_read_blk64() and io_channel_write_blk64() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 09:14:24 +08:00
retval = io_channel_read_blk64(fs->io, blk, 1, buf);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
if (retval)
goto err_out;
Convert to use io_channel_read_blk64() and io_channel_write_blk64() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 09:14:24 +08:00
retval = io_channel_write_blk64(fs->io, new_blk, 1, buf);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
if (retval)
goto err_out;
}
err_out:
ext2fs_free_mem(&buf);
return retval;
}
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
static blk64_t translate_block(blk64_t blk)
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
{
struct list_head *entry;
struct blk_move *bmv;
list_for_each(entry, &blk_move_list) {
bmv = list_entry(entry, struct blk_move, list);
if (bmv->old_loc == blk)
return bmv->new_loc;
}
return 0;
}
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
static int process_block(ext2_filsys fs EXT2FS_ATTR((unused)),
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
blk64_t *block_nr,
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
blk64_t ref_block EXT2FS_ATTR((unused)),
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
int ref_offset EXT2FS_ATTR((unused)),
tune2fs: Fix inefficient O(n**2) algorithms when expanding the inode size When running "tune2fs -I 256" on moderate to large filesystems, the time required to run tune2fs can take many hours (20+ before some users gave up in disgust). This was due to some O(n**2) and O(n*m) algorithms in move_block() and inode_scan_and_fix(), respectively. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-11-15 13:32:39 +08:00
void *priv_data)
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
{
int ret = 0;
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
blk64_t new_blk;
tune2fs: Fix inefficient O(n**2) algorithms when expanding the inode size When running "tune2fs -I 256" on moderate to large filesystems, the time required to run tune2fs can take many hours (20+ before some users gave up in disgust). This was due to some O(n**2) and O(n*m) algorithms in move_block() and inode_scan_and_fix(), respectively. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-11-15 13:32:39 +08:00
ext2fs_block_bitmap bmap = (ext2fs_block_bitmap) priv_data;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-23 09:15:30 +08:00
if (!ext2fs_test_block_bitmap2(bmap, *block_nr))
tune2fs: Fix inefficient O(n**2) algorithms when expanding the inode size When running "tune2fs -I 256" on moderate to large filesystems, the time required to run tune2fs can take many hours (20+ before some users gave up in disgust). This was due to some O(n**2) and O(n*m) algorithms in move_block() and inode_scan_and_fix(), respectively. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-11-15 13:32:39 +08:00
return 0;
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
new_blk = translate_block(*block_nr);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
if (new_blk) {
*block_nr = new_blk;
/*
* This will force the ext2fs_write_inode in the iterator
*/
ret |= BLOCK_CHANGED;
}
return ret;
}
tune2fs: Fix inefficient O(n**2) algorithms when expanding the inode size When running "tune2fs -I 256" on moderate to large filesystems, the time required to run tune2fs can take many hours (20+ before some users gave up in disgust). This was due to some O(n**2) and O(n*m) algorithms in move_block() and inode_scan_and_fix(), respectively. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-11-15 13:32:39 +08:00
static int inode_scan_and_fix(ext2_filsys fs, ext2fs_block_bitmap bmap)
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
{
errcode_t retval = 0;
ext2_ino_t ino;
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
blk64_t blk;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
char *block_buf = 0;
struct ext2_inode inode;
ext2_inode_scan scan = NULL;
retval = ext2fs_get_mem(fs->blocksize * 3, &block_buf);
if (retval)
return retval;
retval = ext2fs_open_inode_scan(fs, 0, &scan);
if (retval)
goto err_out;
while (1) {
retval = ext2fs_get_next_inode(scan, &ino, &inode);
if (retval)
goto err_out;
if (!ino)
break;
if (inode.i_links_count == 0)
continue; /* inode not in use */
/* FIXME!!
* If we end up modifying the journal inode
* the sb->s_jnl_blocks will differ. But a
* subsequent e2fsck fixes that.
* Do we need to fix this ??
*/
libext2fs: ext2fs_[set_]file_acl_block needs to check for 64-bit feature flag The ext2fs_file_acl_block() and ext2fs_set_file_acl_block() needs to only check i_file_acl_high if the 64-bit flag is set. This is needed because otherwise we will run into problems on Hurd systems which actually use that field for h_i_mode_high. This involves an ABI change since we need to pass ext2_filsys to these functions. Fortunately these functions were first included in the 1.42-WIP series, so it's OK for us to change them now. (This is why we have 1.42-WIP releases. :-) Addresses-Sourceforge-Bug: #3379227 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-10-17 08:29:00 +08:00
if (ext2fs_file_acl_block(fs, &inode) &&
Use ext2fs_file_acl_block() instead of using .i_file_acl directly This provides support for 48-bit file acl blocks. Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 10:29:45 +08:00
ext2fs_test_block_bitmap2(bmap,
libext2fs: ext2fs_[set_]file_acl_block needs to check for 64-bit feature flag The ext2fs_file_acl_block() and ext2fs_set_file_acl_block() needs to only check i_file_acl_high if the 64-bit flag is set. This is needed because otherwise we will run into problems on Hurd systems which actually use that field for h_i_mode_high. This involves an ABI change since we need to pass ext2_filsys to these functions. Fortunately these functions were first included in the 1.42-WIP series, so it's OK for us to change them now. (This is why we have 1.42-WIP releases. :-) Addresses-Sourceforge-Bug: #3379227 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-10-17 08:29:00 +08:00
ext2fs_file_acl_block(fs, &inode))) {
blk = translate_block(ext2fs_file_acl_block(fs,
&inode));
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
if (!blk)
continue;
libext2fs: ext2fs_[set_]file_acl_block needs to check for 64-bit feature flag The ext2fs_file_acl_block() and ext2fs_set_file_acl_block() needs to only check i_file_acl_high if the 64-bit flag is set. This is needed because otherwise we will run into problems on Hurd systems which actually use that field for h_i_mode_high. This involves an ABI change since we need to pass ext2_filsys to these functions. Fortunately these functions were first included in the 1.42-WIP series, so it's OK for us to change them now. (This is why we have 1.42-WIP releases. :-) Addresses-Sourceforge-Bug: #3379227 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-10-17 08:29:00 +08:00
ext2fs_file_acl_block_set(fs, &inode, blk);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
/*
* Write the inode to disk so that inode table
* resizing can work
*/
retval = ext2fs_write_inode(fs, ino, &inode);
if (retval)
goto err_out;
}
libext2fs: ext2fs_[set_]file_acl_block needs to check for 64-bit feature flag The ext2fs_file_acl_block() and ext2fs_set_file_acl_block() needs to only check i_file_acl_high if the 64-bit flag is set. This is needed because otherwise we will run into problems on Hurd systems which actually use that field for h_i_mode_high. This involves an ABI change since we need to pass ext2_filsys to these functions. Fortunately these functions were first included in the 1.42-WIP series, so it's OK for us to change them now. (This is why we have 1.42-WIP releases. :-) Addresses-Sourceforge-Bug: #3379227 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-10-17 08:29:00 +08:00
if (!ext2fs_inode_has_valid_blocks2(fs, &inode))
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
continue;
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
retval = ext2fs_block_iterate3(fs, ino, 0, block_buf,
tune2fs: Fix inefficient O(n**2) algorithms when expanding the inode size When running "tune2fs -I 256" on moderate to large filesystems, the time required to run tune2fs can take many hours (20+ before some users gave up in disgust). This was due to some O(n**2) and O(n*m) algorithms in move_block() and inode_scan_and_fix(), respectively. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-11-15 13:32:39 +08:00
process_block, bmap);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
if (retval)
goto err_out;
}
err_out:
ext2fs_free_mem(&block_buf);
tune2fs: fix memory leak in inode_scan_and_fix() When we use ext2fs_open_inode_scan() to iterate inodes and finish jobs, we also need a ext2fs_close_inode_scan(scan) operation, but in inode_scan_and_fix(), we forgot to call it, fix this error. Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-12-03 10:06:40 +08:00
ext2fs_close_inode_scan(scan);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
return retval;
tune2fs: Fix tune2fs -I so it won't corrupt RAID filesystems If a filesystem is built with the stride extended-option (which is often used in RAID filesystems to make sure the block and inode allocation bitmaps don't end up hitting one disk platter harder than the rest), this can cause tune2fs -I to corrupt the filesystem because it fails to handle the case where the allocation bitmaps are located after the inode table, where the inode table needs to grow. Handle this case correctly. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-21 00:49:17 +08:00
}
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
/*
* We need to scan for inode and block bitmaps that may need to be
* moved. This can take place if the filesystem was formatted for
* RAID arrays using the mke2fs's extended option "stride".
*/
static int group_desc_scan_and_fix(ext2_filsys fs, ext2fs_block_bitmap bmap)
{
dgrp_t i;
e2fsprogs: fix blk_t <- blk64_t assignment mismatches Fix all the places where we should be using a blk64_t instead of a blk_t. These fixes are more severe because 64bit values could be truncated silently. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-10-07 21:51:48 +08:00
blk64_t blk, new_blk;
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
for (i = 0; i < fs->group_desc_count; i++) {
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
blk = ext2fs_block_bitmap_loc(fs, i);
Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-23 09:15:30 +08:00
if (ext2fs_test_block_bitmap2(bmap, blk)) {
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
new_blk = translate_block(blk);
if (!new_blk)
continue;
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
ext2fs_block_bitmap_loc_set(fs, i, new_blk);
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
}
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
blk = ext2fs_inode_bitmap_loc(fs, i);
Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-23 09:15:30 +08:00
if (ext2fs_test_block_bitmap2(bmap, blk)) {
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
new_blk = translate_block(blk);
if (!new_blk)
continue;
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
ext2fs_inode_bitmap_loc_set(fs, i, new_blk);
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
}
}
return 0;
}
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
static int expand_inode_table(ext2_filsys fs, unsigned long new_ino_size)
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
{
dgrp_t i;
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
blk64_t blk;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
errcode_t retval;
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
int new_ino_blks_per_grp;
unsigned int j;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
char *old_itable = NULL, *new_itable = NULL;
char *tmp_old_itable = NULL, *tmp_new_itable = NULL;
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
unsigned long old_ino_size;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
int old_itable_size, new_itable_size;
old_itable_size = fs->inode_blocks_per_group * fs->blocksize;
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
old_ino_size = EXT2_INODE_SIZE(fs->super);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
new_ino_blks_per_grp = ext2fs_div_ceil(
EXT2_INODES_PER_GROUP(fs->super) *
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
new_ino_size,
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
fs->blocksize);
new_itable_size = new_ino_blks_per_grp * fs->blocksize;
retval = ext2fs_get_mem(old_itable_size, &old_itable);
if (retval)
return retval;
retval = ext2fs_get_mem(new_itable_size, &new_itable);
if (retval)
goto err_out;
tmp_old_itable = old_itable;
tmp_new_itable = new_itable;
for (i = 0; i < fs->group_desc_count; i++) {
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
blk = ext2fs_inode_table_loc(fs, i);
Convert to use io_channel_read_blk64() and io_channel_write_blk64() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 09:14:24 +08:00
retval = io_channel_read_blk64(fs->io, blk,
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
fs->inode_blocks_per_group, old_itable);
if (retval)
goto err_out;
for (j = 0; j < EXT2_INODES_PER_GROUP(fs->super); j++) {
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
memcpy(new_itable, old_itable, old_ino_size);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
memset(new_itable+old_ino_size, 0,
new_ino_size - old_ino_size);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
new_itable += new_ino_size;
old_itable += old_ino_size;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
}
/* reset the pointer */
old_itable = tmp_old_itable;
new_itable = tmp_new_itable;
Convert to use io_channel_read_blk64() and io_channel_write_blk64() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 09:14:24 +08:00
retval = io_channel_write_blk64(fs->io, blk,
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
new_ino_blks_per_grp, new_itable);
if (retval)
goto err_out;
}
/* Update the meta data */
fs->inode_blocks_per_group = new_ino_blks_per_grp;
tune2fs: fix memory write overflow If we apply this patch 'e2fsprogs/tune2fs: rewrite metadata checksums when resizing inode size', we will trigger a segfault, this is because of the inode cache issues. Firstly we should notice that in expand_inode_table(), we have change the super block's s_inode_size to new inode size(for example, 256). Then we re-compute metadata checksums, see below code flow: |-->rewrite_metadata_checksums |----->rewrite_inodes |-------->ext2fs_write_inode_full In ext2fs_write_inode_full(), if an inode cache is hit, the below code will be executed: /* Check to see if the inode cache needs to be updated */ if (fs->icache) { for (i=0; i < fs->icache->cache_size; i++) { if (fs->icache->cache[i].ino == ino) { memcpy(fs->icache->cache[i].inode, inode, (bufsize > length) ? length : bufsize); break; } } } Before executing rewrite_inodes(), actually the inode in inode cache is allocated by old inode size(for example, 128), but here the memcpy will obviously write overflow, '(bufsize > length) ? length : bufsize' here will return 256(new inode size), so this is wrong, we need to fix this. I think we should call ext2fs_free_inode_cache() in expand_inode_table(), to drop the inode cache, because inode size has changed, if necessary, we will re-create this inode cache. Steps to reproduce this bug (apply 'tune2fs: rewrite metadata checksums when resizing inode size' first): dd if=/dev/zero of=file.img bs=1M count=128 device_name=$(/sbin/losetup -f) /sbin/losetup -f file.img mkfs.ext4 -I 128 -O ^flex_bg $device_name tune2fs -I 256 $device_name Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-12-03 11:31:11 +08:00
ext2fs_free_inode_cache(fs->icache);
fs->icache = 0;
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
fs->super->s_inode_size = new_ino_size;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
err_out:
if (old_itable)
ext2fs_free_mem(&old_itable);
if (new_itable)
ext2fs_free_mem(&new_itable);
return retval;
}
static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs)
{
tune2fs: Fix up to be 64-bit block number safe Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-06-14 04:00:00 +08:00
blk64_t blk;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
ext2_ino_t ino;
unsigned int group = 0;
unsigned int count = 0;
int total_free = 0;
int group_free = 0;
/*
* First calculate the block statistics
*/
for (blk = fs->super->s_first_data_block;
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 08:46:34 +08:00
blk < ext2fs_blocks_count(fs->super); blk++) {
Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-23 09:15:30 +08:00
if (!ext2fs_fast_test_block_bitmap2(fs->block_map, blk)) {
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
group_free++;
total_free++;
}
count++;
if ((count == fs->super->s_blocks_per_group) ||
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 08:46:34 +08:00
(blk == ext2fs_blocks_count(fs->super)-1)) {
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
ext2fs_bg_free_blocks_count_set(fs, group++,
group_free);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
count = 0;
group_free = 0;
}
}
Fix superblock field s_blocks_count for bigalloc file systems Treat the s_blocks_count field in the superblock as a free block count (instead of the number of free clusters) for bigalloc file systems. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-06-16 13:38:43 +08:00
total_free = EXT2FS_C2B(fs, total_free);
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 08:46:34 +08:00
ext2fs_free_blocks_count_set(fs->super, total_free);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
/*
* Next, calculate the inode statistics
*/
group_free = 0;
total_free = 0;
count = 0;
group = 0;
/* Protect loop from wrap-around if s_inodes_count maxed */
for (ino = 1; ino <= fs->super->s_inodes_count && ino > 0; ino++) {
Convert tune2fs, dumpe2fs, and e2image to the new bitmap interface Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-23 09:15:30 +08:00
if (!ext2fs_fast_test_inode_bitmap2(fs->inode_map, ino)) {
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
group_free++;
total_free++;
}
count++;
if ((count == fs->super->s_inodes_per_group) ||
(ino == fs->super->s_inodes_count)) {
Convert to use block group accessor functions Convert direct accesses to use the following block group accessor functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(), ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(), ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(), ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(), ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(), ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 09:43:47 +08:00
ext2fs_bg_free_inodes_count_set(fs, group++,
group_free);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
count = 0;
group_free = 0;
}
}
fs->super->s_free_inodes_count = total_free;
ext2fs_mark_super_dirty(fs);
return 0;
}
#define list_for_each_safe(pos, pnext, head) \
for (pos = (head)->next, pnext = pos->next; pos != (head); \
pos = pnext, pnext = pos->next)
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
static void free_blk_move_list(void)
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
{
struct list_head *entry, *tmp;
struct blk_move *bmv;
list_for_each_safe(entry, tmp, &blk_move_list) {
bmv = list_entry(entry, struct blk_move, list);
list_del(entry);
ext2fs_free_mem(&bmv);
}
tune2fs: Fix tune2fs -I so it won't corrupt RAID filesystems If a filesystem is built with the stride extended-option (which is often used in RAID filesystems to make sure the block and inode allocation bitmaps don't end up hitting one disk platter harder than the rest), this can cause tune2fs -I to corrupt the filesystem because it fails to handle the case where the allocation bitmaps are located after the inode table, where the inode table needs to grow. Handle this case correctly. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-21 00:49:17 +08:00
return;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
}
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
static int resize_inode(ext2_filsys fs, unsigned long new_size)
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
{
errcode_t retval;
int new_ino_blks_per_grp;
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
ext2fs_block_bitmap bmap;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
tune2fs: handle inode and/or block bitmap read failures in resize_inode() Handle these failures in resize_inode, and handle the propagated error in the caller. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-17 04:49:37 +08:00
retval = ext2fs_read_inode_bitmap(fs);
if (retval) {
fputs(_("Failed to read inode bitmap\n"), stderr);
return retval;
}
retval = ext2fs_read_block_bitmap(fs);
if (retval) {
Fix more spelling errors found by translators and add pluralization Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-10-10 05:08:47 +08:00
fputs(_("Failed to read block bitmap\n"), stderr);
tune2fs: handle inode and/or block bitmap read failures in resize_inode() Handle these failures in resize_inode, and handle the propagated error in the caller. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-17 04:49:37 +08:00
return retval;
}
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
INIT_LIST_HEAD(&blk_move_list);
new_ino_blks_per_grp = ext2fs_div_ceil(
EXT2_INODES_PER_GROUP(fs->super)*
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
new_size,
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
fs->blocksize);
/* We may change the file system.
* Mark the file system as invalid so that
* the user is prompted to run fsck.
*/
fs->super->s_state &= ~EXT2_VALID_FS;
retval = ext2fs_allocate_block_bitmap(fs, _("blocks to be moved"),
&bmap);
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
if (retval) {
fputs(_("Failed to allocate block bitmap when "
"increasing inode size\n"), stderr);
tune2fs: Fix tune2fs -I so it won't corrupt RAID filesystems If a filesystem is built with the stride extended-option (which is often used in RAID filesystems to make sure the block and inode allocation bitmaps don't end up hitting one disk platter harder than the rest), this can cause tune2fs -I to corrupt the filesystem because it fails to handle the case where the allocation bitmaps are located after the inode table, where the inode table needs to grow. Handle this case correctly. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-21 00:49:17 +08:00
return retval;
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
}
retval = get_move_bitmaps(fs, new_ino_blks_per_grp, bmap);
if (retval) {
fputs(_("Not enough space to increase inode size \n"), stderr);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
goto err_out;
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
}
retval = move_block(fs, bmap);
if (retval) {
fputs(_("Failed to relocate blocks during inode resize \n"),
stderr);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
goto err_out;
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
}
tune2fs: Fix inefficient O(n**2) algorithms when expanding the inode size When running "tune2fs -I 256" on moderate to large filesystems, the time required to run tune2fs can take many hours (20+ before some users gave up in disgust). This was due to some O(n**2) and O(n*m) algorithms in move_block() and inode_scan_and_fix(), respectively. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-11-15 13:32:39 +08:00
retval = inode_scan_and_fix(fs, bmap);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
if (retval)
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
goto err_out_undo;
tune2fs: Fix tune2fs -I so it won't corrupt RAID filesystems If a filesystem is built with the stride extended-option (which is often used in RAID filesystems to make sure the block and inode allocation bitmaps don't end up hitting one disk platter harder than the rest), this can cause tune2fs -I to corrupt the filesystem because it fails to handle the case where the allocation bitmaps are located after the inode table, where the inode table needs to grow. Handle this case correctly. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-21 00:49:17 +08:00
tune2fs: Handle fs meta-data blocks during inode resize With file system formated for RAID arrays we can have inode bitmap and block bitmap after inode table. Make sure we move them around properly when doing inode resize. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:30 +08:00
retval = group_desc_scan_and_fix(fs, bmap);
if (retval)
goto err_out_undo;
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
retval = expand_inode_table(fs, new_size);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
if (retval)
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
goto err_out_undo;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
ext2fs_calculate_summary_stats(fs);
fs->super->s_state |= EXT2_VALID_FS;
/* mark super block and block bitmap as dirty */
ext2fs_mark_super_dirty(fs);
ext2fs_mark_bb_dirty(fs);
err_out:
free_blk_move_list();
ext2fs_free_block_bitmap(bmap);
return retval;
tune2fs: Make e2fsprogs handle ENOSPC better with inode resize This removes the metadata block bitmap and makes the error handling simpler. It also check for the enospc with the correct number needed blocks. Also added specific error messages. We need to run e2undo only if we start modiyfing inode, group desc and inode table. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2009-08-06 14:12:29 +08:00
err_out_undo:
free_blk_move_list();
ext2fs_free_block_bitmap(bmap);
fputs(_("Error in resizing the inode size.\n"
"Run e2undo to undo the "
"file system changes. \n"), stderr);
return retval;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
}
static int tune2fs_setup_tdb(const char *name, io_manager *io_ptr)
{
errcode_t retval = 0;
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
const char *tdb_dir;
misc: fix undo file setup Fix Coverity bugs 1297094-1297101 by fixing all the mutations in the *_setup_tdb() functions, fixing buffer overflows, and checking return values. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-17 08:19:52 +08:00
char *tdb_file = NULL;
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
char *dev_name, *tmp_name;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
tune2fs: optionally create undo file Provide the user with an option to create an undo file so that they can roll back a failed tuning operation. Previously, one would be created for inode resize if a bunch of (undocumented) conditions were met. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-05 22:41:08 +08:00
/* (re)open a specific undo file */
if (undo_file && undo_file[0] != 0) {
misc: fix undo file setup Fix Coverity bugs 1297094-1297101 by fixing all the mutations in the *_setup_tdb() functions, fixing buffer overflows, and checking return values. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-17 08:19:52 +08:00
retval = set_undo_io_backing_manager(*io_ptr);
if (retval)
goto err;
tune2fs: optionally create undo file Provide the user with an option to create an undo file so that they can roll back a failed tuning operation. Previously, one would be created for inode resize if a bunch of (undocumented) conditions were met. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-05 22:41:08 +08:00
*io_ptr = undo_io_manager;
misc: fix undo file setup Fix Coverity bugs 1297094-1297101 by fixing all the mutations in the *_setup_tdb() functions, fixing buffer overflows, and checking return values. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-17 08:19:52 +08:00
retval = set_undo_io_backup_file(undo_file);
if (retval)
goto err;
printf(_("Overwriting existing filesystem; this can be undone "
"using the command:\n"
" e2undo %s %s\n\n"),
tune2fs: optionally create undo file Provide the user with an option to create an undo file so that they can roll back a failed tuning operation. Previously, one would be created for inode resize if a bunch of (undocumented) conditions were met. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-05 22:41:08 +08:00
undo_file, name);
return retval;
}
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
/*
* Configuration via a conf file would be
* nice
*/
tdb_dir = getenv("E2FSPROGS_UNDO_DIR");
if (!tdb_dir)
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
tdb_dir = "/var/lib/e2fsprogs";
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
if (!strcmp(tdb_dir, "none") || (tdb_dir[0] == 0) ||
access(tdb_dir, W_OK))
return 0;
misc: fix undo file setup Fix Coverity bugs 1297094-1297101 by fixing all the mutations in the *_setup_tdb() functions, fixing buffer overflows, and checking return values. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-17 08:19:52 +08:00
tmp_name = strdup(name);
if (!tmp_name)
goto errout;
dev_name = basename(tmp_name);
e2fsck, tune2fs: Fix Hurd compilation problem due to lack of PATH_MAX Hurd doesn't define PATH_MAX, so calculate the exact size needed for the tdb filename, and allocate it dynamically. Addresses-Debian-Bug: #521602 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-04-18 22:53:32 +08:00
tdb_file = malloc(strlen(tdb_dir) + 9 + strlen(dev_name) + 7 + 1);
misc: fix undo file setup Fix Coverity bugs 1297094-1297101 by fixing all the mutations in the *_setup_tdb() functions, fixing buffer overflows, and checking return values. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-17 08:19:52 +08:00
if (!tdb_file) {
free(tmp_name);
goto errout;
}
Fix gcc -Wall warnings in tune2fs Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-06-07 23:51:33 +08:00
sprintf(tdb_file, "%s/tune2fs-%s.e2undo", tdb_dir, dev_name);
misc: fix undo file setup Fix Coverity bugs 1297094-1297101 by fixing all the mutations in the *_setup_tdb() functions, fixing buffer overflows, and checking return values. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-17 08:19:52 +08:00
free(tmp_name);
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
mke2fs, tune2fs: remove unneeded access() call Addresses-Coverity-Id: #709536 Addresses-Coverity-Id: #709535 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2014-01-11 10:39:27 +08:00
if ((unlink(tdb_file) < 0) && (errno != ENOENT)) {
retval = errno;
com_err(program_name, retval,
_("while trying to delete %s"), tdb_file);
misc: fix undo file setup Fix Coverity bugs 1297094-1297101 by fixing all the mutations in the *_setup_tdb() functions, fixing buffer overflows, and checking return values. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-17 08:19:52 +08:00
goto errout;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
}
misc: fix undo file setup Fix Coverity bugs 1297094-1297101 by fixing all the mutations in the *_setup_tdb() functions, fixing buffer overflows, and checking return values. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-17 08:19:52 +08:00
retval = set_undo_io_backing_manager(*io_ptr);
if (retval)
goto errout;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
*io_ptr = undo_io_manager;
misc: fix undo file setup Fix Coverity bugs 1297094-1297101 by fixing all the mutations in the *_setup_tdb() functions, fixing buffer overflows, and checking return values. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-17 08:19:52 +08:00
retval = set_undo_io_backup_file(tdb_file);
if (retval)
goto errout;
printf(_("Overwriting existing filesystem; this can be undone "
"using the command:\n"
" e2undo %s %s\n\n"),
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
tdb_file, name);
misc: fix undo file setup Fix Coverity bugs 1297094-1297101 by fixing all the mutations in the *_setup_tdb() functions, fixing buffer overflows, and checking return values. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-17 08:19:52 +08:00
e2fsck, tune2fs: Fix Hurd compilation problem due to lack of PATH_MAX Hurd doesn't define PATH_MAX, so calculate the exact size needed for the tdb filename, and allocate it dynamically. Addresses-Debian-Bug: #521602 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-04-18 22:53:32 +08:00
free(tdb_file);
misc: fix undo file setup Fix Coverity bugs 1297094-1297101 by fixing all the mutations in the *_setup_tdb() functions, fixing buffer overflows, and checking return values. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-17 08:19:52 +08:00
return 0;
errout:
free(tdb_file);
err:
com_err("tune2fs", retval, "while trying to setup undo file\n");
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
return retval;
}
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
misc: cleanup gcc -Wall warnings Also change ext2fs_symlink() so that the target parameter is a const char *, thus promising that we will never change the incoming string. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-07-14 01:23:28 +08:00
static int
misc: quiet signed/unsigned charactr compiler warnings Quiet warnings about signed vs. unsigned character mismatch. Use __u8 for storing UUIDs instead of char to match the superblock s_uuid field. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-30 07:30:39 +08:00
fs_update_journal_user(struct ext2_super_block *sb, __u8 old_uuid[UUID_SIZE])
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
{
int retval, nr_users, start;
journal_superblock_t *jsb;
ext2_filsys jfs;
misc: quiet signed/unsigned charactr compiler warnings Quiet warnings about signed vs. unsigned character mismatch. Use __u8 for storing UUIDs instead of char to match the superblock s_uuid field. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-30 07:30:39 +08:00
__u8 *j_uuid;
char *journal_path;
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
char uuid[UUID_STR_SIZE];
misc: fix alignment warnings on ARM Some temporary char buffers allocated on the stack are not properly aligned when typecast to a structure containing __u32 or __u64 types, and this can cause alignment warnings on ARM and other alignment sensitive architectures, and potential slowdowns to do fixups. Fix the buffer alignment to avoid such issues. Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=680090 Reported-by: Gordan Bobic <gordan.bobic@gmail.com> Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-23 06:40:51 +08:00
char buf[SUPERBLOCK_SIZE] __attribute__ ((aligned(8)));
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (!ext2fs_has_feature_journal(sb) || uuid_is_null(sb->s_journal_uuid))
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
return 0;
uuid_unparse(sb->s_journal_uuid, uuid);
journal_path = blkid_get_devname(NULL, "UUID", uuid);
if (!journal_path)
return 0;
retval = ext2fs_open2(journal_path, io_options,
EXT2_FLAG_JOURNAL_DEV_OK | EXT2_FLAG_RW,
0, 0, unix_io_manager, &jfs);
if (retval) {
com_err(program_name, retval,
_("while trying to open %s"),
journal_path);
return retval;
}
misc: quiet signed/unsigned charactr compiler warnings Quiet warnings about signed vs. unsigned character mismatch. Use __u8 for storing UUIDs instead of char to match the superblock s_uuid field. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-30 07:30:39 +08:00
retval = get_journal_sb(jfs, buf);
if (retval != 0) {
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
if (retval == EXT2_ET_UNSUPP_FEATURE)
fprintf(stderr, _("%s is not a journal device.\n"),
journal_path);
return retval;
}
jsb = (journal_superblock_t *) buf;
/* Find the filesystem UUID */
nr_users = ntohl(jsb->s_nr_users);
misc: quiet signed/unsigned charactr compiler warnings Quiet warnings about signed vs. unsigned character mismatch. Use __u8 for storing UUIDs instead of char to match the superblock s_uuid field. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-30 07:30:39 +08:00
j_uuid = journal_user(old_uuid, jsb->s_users, nr_users);
if (j_uuid == NULL) {
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
fputs(_("Filesystem's UUID not found on journal device.\n"),
stderr);
return EXT2_ET_LOAD_EXT_JOURNAL;
}
memcpy(j_uuid, sb->s_uuid, UUID_SIZE);
start = ext2fs_journal_sb_start(jfs->blocksize);
/* Write back the journal superblock */
misc: quiet signed/unsigned charactr compiler warnings Quiet warnings about signed vs. unsigned character mismatch. Use __u8 for storing UUIDs instead of char to match the superblock s_uuid field. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-30 07:30:39 +08:00
retval = io_channel_write_blk64(jfs->io, start, -SUPERBLOCK_SIZE, buf);
if (retval != 0) {
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
com_err(program_name, retval,
"while writing journal superblock.");
return retval;
}
ext2fs_close(jfs);
return 0;
}
tune2fs: allow tune2fs to be built as a static library for Android Sync up with aosp's e2fsprogs commits: d25948b9b4a9e361ef071dc8175df0407f60b7e0 e59f7c7cedb1e07eb4dbbb66e115c14faea19f19 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-07-13 05:39:26 +08:00
#ifndef BUILD_AS_LIB
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
int main(int argc, char **argv)
tune2fs: allow tune2fs to be built as a static library for Android Sync up with aosp's e2fsprogs commits: d25948b9b4a9e361ef071dc8175df0407f60b7e0 e59f7c7cedb1e07eb4dbbb66e115c14faea19f19 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-07-13 05:39:26 +08:00
#else
int tune2fs_main(int argc, char **argv)
#endif /* BUILD_AS_LIB */
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
{
errcode_t retval;
ext2_filsys fs;
struct ext2_super_block *sb;
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
io_manager io_ptr, io_ptr_orig = NULL;
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
int rc = 0;
misc: cleanup gcc -Wall warnings Also change ext2fs_symlink() so that the target parameter is a const char *, thus promising that we will never change the incoming string. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-07-14 01:23:28 +08:00
char default_undo_file[1] = { 0 };
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
#ifdef ENABLE_NLS
setlocale(LC_MESSAGES, "");
Newer libintl needs LC_CTYPE to be set in addition to LC_MESSAGES.
2002-03-05 16:26:52 +08:00
setlocale(LC_CTYPE, "");
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
Pass the gettext() function to libcom_err For those e2fsprogs programs which use libcom_err and are internationalized, pass the gettext() function to libcom_err during program initialization. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-10-05 13:00:30 +08:00
set_com_err_gettext(gettext);
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
#endif
if (argc && *argv)
program_name = *argv;
Use the newer add/remove_error_table com_err interfaces Change all of the e2fsprogs programs to use the newer add_error_table() and remove_error_table() interfaces instead of the much older initialize_*_error_table() function. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2006-12-26 16:38:07 +08:00
add_error_table(&et_ext2_error_table);
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
configure.in: add --disable-libblkid option Add an option to switch between the private (in-tree) libblkid and public (in-system installed) library. The private version is still enabled by default. If --disable-libblkid is specified the findfs(8) program, which is a variant of tune2fs, is also not built or installed. Signed-off-by: Karel Zak <kzak@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-04-22 21:18:30 +08:00
#ifdef CONFIG_BUILD_FINDFS
Add support for searching /proc/evms/volumes when interpreting LABEL=xxx or UUID=xxx. Add new utility program /sbin/findfs, which interprets LABEL=xxx or UUID=xxx, and returns the device name. (Part of tune2fs).
2002-08-18 11:01:22 +08:00
if (strcmp(get_progname(argv[0]), "findfs") == 0)
do_findfs(argc, argv);
configure.in: add --disable-libblkid option Add an option to switch between the private (in-tree) libblkid and public (in-system installed) library. The private version is still enabled by default. If --disable-libblkid is specified the findfs(8) program, which is a variant of tune2fs, is also not built or installed. Signed-off-by: Karel Zak <kzak@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-04-22 21:18:30 +08:00
#endif
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
if (strcmp(get_progname(argv[0]), "e2label") == 0)
parse_e2label_options(argc, argv);
else
parse_tune2fs_options(argc, argv);
Remove trailing whitespace for the entire source tree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-28 11:07:54 +08:00
Add --enable-test-io-debug configure option which causes e2fsck and tune2fs to use the test I/O manager. The test I/O manager has been changed to not do anything extra by default, unless the TEST_IO_FLAGS and/or TEST_IO_BLOCK environment variables are set, which controls what I/O operations are logged and a block number to watch, respectively. The log messages are sent to stderr by default, unless a filename is specified via the TEST_IO_LOGFILE environment variable.
2003-05-06 00:08:47 +08:00
#ifdef CONFIG_TESTIO_DEBUG
Only use the test_io manager if the right environment variables are set In order to make it possible for the test_io manager to be compiled in by default, make all of the programs that might try to use it to only do so if the environment variables TEST_IO_FLAGS and TEST_IO_DEBUG are set. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-09-01 23:17:29 +08:00
if (getenv("TEST_IO_FLAGS") || getenv("TEST_IO_DEBUG")) {
io_ptr = test_io_manager;
test_io_backing_manager = unix_io_manager;
} else
Add --enable-test-io-debug configure option which causes e2fsck and tune2fs to use the test I/O manager. The test I/O manager has been changed to not do anything extra by default, unless the TEST_IO_FLAGS and/or TEST_IO_BLOCK environment variables are set, which controls what I/O operations are logged and a block number to watch, respectively. The log messages are sent to stderr by default, unless a filename is specified via the TEST_IO_LOGFILE environment variable.
2003-05-06 00:08:47 +08:00
#endif
Only use the test_io manager if the right environment variables are set In order to make it possible for the test_io manager to be compiled in by default, make all of the programs that might try to use it to only do so if the environment variables TEST_IO_FLAGS and TEST_IO_DEBUG are set. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-09-01 23:17:29 +08:00
io_ptr = unix_io_manager;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
retry_open:
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
if ((open_flag & EXT2_FLAG_RW) == 0 || f_flag)
open_flag |= EXT2_FLAG_SKIP_MMP;
tune2fs: explicitly disallow tuning of journal devices Spit out a more specific error if someone tries to modify an external journal device. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-09 07:12:21 +08:00
open_flag |= EXT2_FLAG_64BITS | EXT2_FLAG_JOURNAL_DEV_OK;
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
/* keep the filesystem struct around to dump MMP data */
open_flag |= EXT2_FLAG_NOFREE_ON_ERROR;
Remove trailing whitespace for the entire source tree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-28 11:07:54 +08:00
retval = ext2fs_open2(device_name, io_options, open_flag,
Add support for passing options to the io layer using the URL syntax. For example, /tmp/test.img?offset=1024. Multiple options can separated using the & character, although at the moment the only option implemented is the offset option in the unix_io layer.
2004-12-01 03:07:11 +08:00
0, 0, io_ptr, &fs);
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
if (retval) {
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
com_err(program_name, retval,
_("while trying to open %s"),
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
device_name);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
if (retval == EXT2_ET_MMP_FSCK_ON ||
retval == EXT2_ET_MMP_UNKNOWN_SEQ)
dump_mmp_msg(fs->mmp_buf,
_("If you are sure the filesystem "
"is not in use on any node, run:\n"
"'tune2fs -f -E clear_mmp {device}'\n"));
else if (retval == EXT2_ET_MMP_FAILED)
dump_mmp_msg(fs->mmp_buf, NULL);
else if (retval == EXT2_ET_MMP_MAGIC_INVALID)
fprintf(stderr,
_("MMP block magic is bad. Try to fix it by "
"running:\n'e2fsck -f %s'\n"), device_name);
misc: add plausibility checks to debugfs/tune2fs/dumpe2fs/e2fsck If any of these utilities detect a bad superblock magic, call check_plausibility to see if blkid can identify the passed-in argument as something else (xfs, partition, etc.) in the hopes of catching a user error. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-14 06:12:39 +08:00
else if (retval == EXT2_ET_BAD_MAGIC)
check_plausibility(device_name, CHECK_FS_EXIST, NULL);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
else if (retval != EXT2_ET_MMP_FAILED)
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
fprintf(stderr, "%s",
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
_("Couldn't find valid filesystem superblock.\n"));
ext2fs_free(fs);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
exit(1);
}
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (ext2fs_has_feature_journal_dev(fs->super)) {
tune2fs: explicitly disallow tuning of journal devices Spit out a more specific error if someone tries to modify an external journal device. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: TR Reardon <thomas_reardon@hotmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-09-09 07:12:21 +08:00
fprintf(stderr, "%s", _("Cannot modify a journal device.\n"));
ext2fs_free(fs);
exit(1);
}
Use rbtree bitmaps for dumpe2fs, debugfs, and tune2fs For large file systems, using the rbtree bitmap can save a lot of memory. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2012-03-16 04:39:56 +08:00
fs->default_bitmap_type = EXT2FS_BMAP64_RBTREE;
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
tune2fs: optionally create undo file Provide the user with an option to create an undo file so that they can roll back a failed tuning operation. Previously, one would be created for inode resize if a bunch of (undocumented) conditions were met. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-05 22:41:08 +08:00
if (I_flag) {
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
/*
* Check the inode size is right so we can issue an
* error message and bail before setting up the tdb
* file.
*/
if (new_inode_size == EXT2_INODE_SIZE(fs->super)) {
tune2fs: Fix format string warnings Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-04-23 03:13:37 +08:00
fprintf(stderr, _("The inode size is already %lu\n"),
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
new_inode_size);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
rc = 1;
goto closefs;
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
}
if (new_inode_size < EXT2_INODE_SIZE(fs->super)) {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
fprintf(stderr, "%s",
_("Shrinking inode size is not supported\n"));
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
rc = 1;
goto closefs;
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
}
tune2fs: disallow tune2fs to set inode size larger than block size Disallow tune2fs command to set the inode size to be larger than the block size. Without this patch, tune2fs makes the file system to be unmountable. Steps to reproduce: 1.Create ext4 without flex_bg (or just create ext3) # mke2fs -t ext4 -O ^flex_bg DEV 2.Set inode size larger than block size # tune2fs -I 8192 DEV 3. We failed to mount FS # mount DEV MP mount: wrong fs type, bad option, bad superblock on /dev/sda7, missing codepage or helper program, or other error In some cases useful info is found in syslog - try dmesg | tail or so Signed-off-by: Akira Fujita <a-fujita@rs.jp.nec.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-04-22 11:14:28 +08:00
if (new_inode_size > fs->blocksize) {
fprintf(stderr, _("Invalid inode size %lu (max %d)\n"),
new_inode_size, fs->blocksize);
rc = 1;
goto closefs;
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
}
tune2fs: confirm dangerous operations Give admins a short amount of time to confirm that they want to proceed with a dangerous operation. Refuse to perform the op unless the filesystem is freshly checked. Cc: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-02-14 06:38:11 +08:00
check_fsck_needed(fs,
_("Resizing inodes could take some time."));
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
/*
* If inode resize is requested use the
* Undo I/O manager
*/
misc: cleanup gcc -Wall warnings Also change ext2fs_symlink() so that the target parameter is a const char *, thus promising that we will never change the incoming string. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-07-14 01:23:28 +08:00
undo_file = default_undo_file;
tune2fs: optionally create undo file Provide the user with an option to create an undo file so that they can roll back a failed tuning operation. Previously, one would be created for inode resize if a bunch of (undocumented) conditions were met. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-05 22:41:08 +08:00
}
/* Set up an undo file */
if (undo_file && io_ptr_orig == NULL) {
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
io_ptr_orig = io_ptr;
retval = tune2fs_setup_tdb(device_name, &io_ptr);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
if (retval) {
rc = 1;
goto closefs;
}
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
if (io_ptr != io_ptr_orig) {
e2fsprogs: introduce ext2fs_close_free() helper Currently there are many uses of ext2fs_close() which might be wrong. First of all ext2fs_close() does not set the ext2_filsys pointer to NULL so the caller is responsible for clearing it, however there are some cases there we do not do it. Second of all very small number of users of ext2fs_close() actually check the return value. If there is a problem in ext2fs_close() it will not even free the ext2_filsys structure, but majority of users expect it to do so. To fix both problems this commit introduces a new helper ext2fs_close_free() which will not only check for the return value and free the ext2_filsys structure if the call to ext2fs_close2() failed, but it will also set the ext2_filsys pointer to NULL. Replace every use of ext2fs_close() in e2fsprogs tools with ext2fs_close_free() - there is no real reason to keep using ext2fs_close(). Signed-off-by: Lukas Czerner <lczerner@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
2014-07-06 09:06:29 +08:00
ext2fs_close_free(&fs);
tune2fs: Improve the error messages for tune2fs -I If the current inode size is less than or equal to the requested inode size, either explain that shrinking the inode size is not supported, or that the inode is already the requested size. Also, open the filesystem provisionally first to do the inode size check and don't setup up the undo log until we know that we're actually going to perform the inode resizing operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-28 04:00:48 +08:00
goto retry_open;
}
}
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
sb = fs->super;
Don't write changes to the backup superblocks by default This patch changes ext2fs_open() to set EXT2_FLAG_MASTER_SB_ONLY by default. This avoids some problems in e2fsck (reported by Jim Garlick) where a corrupt journal can end up writing the bad superblock to the backups. In general, only e2fsck (after the filesystem is clean), tune2fs, and resize2fs should change the backup superblocks by default. Most callers of ext2fs_open() should not be touching anything where the backups should be touched. So let's change the defaults to avoid potential problems. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-06-19 06:26:50 +08:00
fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY;
mke2fs,tune2fs: Enable huge_file, dir_nlink, and extra_isize features Also change mke2fs.conf to enable huge_file,dir_nlink,extra_isize, and uninit_bg by default for ext4 filesystems, and enable extra_isize in the library as well. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-10 22:49:59 +08:00
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
if (print_label) {
/* For e2label emulation */
ChangeLog, e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: Fix gcc -Wall complaints, including one bug in tune2fs caused by a block automatic shadowing version of the variable we really wanted to use, which broke the logic testing to see if the filesystem was mounted. ChangeLog, MCONFIG.in: (gcc-wall-new): Added new target which forgoes the make clean so we only check the newly modified .c files.
2001-01-12 00:08:23 +08:00
printf("%.*s\n", (int) sizeof(sb->s_volume_name),
sb->s_volume_name);
Use the newer add/remove_error_table com_err interfaces Change all of the e2fsprogs programs to use the newer add_error_table() and remove_error_table() interfaces instead of the much older initialize_*_error_table() function. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2006-12-26 16:38:07 +08:00
remove_error_table(&et_ext2_error_table);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
goto closefs;
ChangeLog, Makefile.in, tune2fs.c: Makefile.in, tune2fs.c: Move e2label functionality into tune2fs, using argv[0] as a dispatch. This allows e2label to be (more) safely used on mounted filesystems.
2001-01-09 08:16:26 +08:00
}
mke2fs,tune2fs: Enable huge_file, dir_nlink, and extra_isize features Also change mke2fs.conf to enable huge_file,dir_nlink,extra_isize, and uninit_bg by default for ext4 filesystems, and enable extra_isize in the library as well. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-10 22:49:59 +08:00
Remove TUNE2FS_SKIP_MOUNT_CHECK environment variable support; it is not needed in the initrd script, and wasn't completely supported anyway.
2004-04-13 00:37:55 +08:00
retval = ext2fs_check_if_mounted(device_name, &mount_flags);
if (retval) {
com_err("ext2fs_check_if_mount", retval,
_("while determining whether %s is mounted."),
device_name);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
rc = 1;
goto closefs;
ChangeLog, tune2fs.c: tune2fs.c (main): Add support to allow HAS_JOURNAL flag to be cleared, but only if the filesystem is unmounted or mounted read-only. Changed struct ext2fs_sb to struct ext2_super, and cleaned up old code which was needed for old versions of ext2_fs.h (not needed since we're using our own version now).
2001-01-01 23:26:58 +08:00
}
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
/* Normally we only need to write out the superblock */
fs->flags |= EXT2_FLAG_SUPER_ONLY;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
if (c_flag) {
ChangeLog, tune2fs.c: tune2fs.c (main): Add support to allow HAS_JOURNAL flag to be cleared, but only if the filesystem is unmounted or mounted read-only. Changed struct ext2fs_sb to struct ext2_super, and cleaned up old code which was needed for old versions of ext2_fs.h (not needed since we're using our own version now).
2001-01-01 23:26:58 +08:00
sb->s_max_mnt_count = max_mount_count;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
ext2fs_mark_super_dirty(fs);
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
printf(_("Setting maximal mount count to %d\n"),
max_mount_count);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
}
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
if (C_flag) {
ChangeLog, tune2fs.c: tune2fs.c (main): Add support to allow HAS_JOURNAL flag to be cleared, but only if the filesystem is unmounted or mounted read-only. Changed struct ext2fs_sb to struct ext2_super, and cleaned up old code which was needed for old versions of ext2_fs.h (not needed since we're using our own version now).
2001-01-01 23:26:58 +08:00
sb->s_mnt_count = mount_count;
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
ext2fs_mark_super_dirty(fs);
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
printf(_("Setting current mount count to %d\n"), mount_count);
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
}
if (e_flag) {
ChangeLog, tune2fs.c: tune2fs.c (main): Add support to allow HAS_JOURNAL flag to be cleared, but only if the filesystem is unmounted or mounted read-only. Changed struct ext2fs_sb to struct ext2_super, and cleaned up old code which was needed for old versions of ext2_fs.h (not needed since we're using our own version now).
2001-01-01 23:26:58 +08:00
sb->s_errors = errors;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
ext2fs_mark_super_dirty(fs);
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
printf(_("Setting error behavior to %d\n"), errors);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
}
ChangeLog, tune2fs.c: tune2fs.c (main): Add support to allow HAS_JOURNAL flag to be cleared, but only if the filesystem is unmounted or mounted read-only. Changed struct ext2fs_sb to struct ext2_super, and cleaned up old code which was needed for old versions of ext2_fs.h (not needed since we're using our own version now).
2001-01-01 23:26:58 +08:00
if (g_flag) {
sb->s_def_resgid = resgid;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
ext2fs_mark_super_dirty(fs);
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
printf(_("Setting reserved blocks gid to %lu\n"), resgid);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
}
ChangeLog, debugfs.8.in, debugfs.c: Add a -V option which displays the current version. ChangeLog, unix.c: unix.c (e2fsck_update_progress): Remove unused variables. ChangeLog, inode.c: inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup() is called early because of a missing inode table in a block group, the current_inode counter wasn't incremented correctly. ChangeLog, tst_uuid.c: tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter. ChangeLog, test_icount.c: test_icount.c (main): Fix main() declaration so that it returns int, not void. Many files: fsck.c (ignore): Remove unused variable cp. chattr.c (fatal_error): tune2fs.c (usage): lsattr.c (usage): dumpe2fs.c (usage): badblocks.c (usage): Remove volatile from declaration. fsck.c: Change use of strdup to be string_copy, since we don't trust what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 13:11:14 +08:00
if (i_flag) {
fix miscellaneous build warnings Fix various unused variable and use-uninitialized warnings. Add generated files into .gitignore. Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2014-04-15 00:20:25 +08:00
if ((unsigned long long)interval >= (1ULL << 32)) {
tune2fs: Fix overflow of interval check Add the check of maximum check interval. s_checkinterval is 32bit variable, so it cannot be set more than 2^32. Signed-off-by: Kazuya Mio <k-mio@sx.jp.nec.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-04-19 04:11:39 +08:00
com_err(program_name, 0,
_("interval between checks is too big (%lu)"),
interval);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
rc = 1;
goto closefs;
tune2fs: Fix overflow of interval check Add the check of maximum check interval. s_checkinterval is 32bit variable, so it cannot be set more than 2^32. Signed-off-by: Kazuya Mio <k-mio@sx.jp.nec.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-04-19 04:11:39 +08:00
}
ChangeLog, tune2fs.c: tune2fs.c (main): Add support to allow HAS_JOURNAL flag to be cleared, but only if the filesystem is unmounted or mounted read-only. Changed struct ext2fs_sb to struct ext2_super, and cleaned up old code which was needed for old versions of ext2_fs.h (not needed since we're using our own version now).
2001-01-01 23:26:58 +08:00
sb->s_checkinterval = interval;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
ext2fs_mark_super_dirty(fs);
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
printf(_("Setting interval between checks to %lu seconds\n"),
interval);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
}
ChangeLog, debugfs.8.in, debugfs.c: Add a -V option which displays the current version. ChangeLog, unix.c: unix.c (e2fsck_update_progress): Remove unused variables. ChangeLog, inode.c: inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup() is called early because of a missing inode table in a block group, the current_inode counter wasn't incremented correctly. ChangeLog, tst_uuid.c: tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter. ChangeLog, test_icount.c: test_icount.c (main): Fix main() declaration so that it returns int, not void. Many files: fsck.c (ignore): Remove unused variable cp. chattr.c (fatal_error): tune2fs.c (usage): lsattr.c (usage): dumpe2fs.c (usage): badblocks.c (usage): Remove volatile from declaration. fsck.c: Change use of strdup to be string_copy, since we don't trust what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 13:11:14 +08:00
if (m_flag) {
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 08:46:34 +08:00
ext2fs_r_blocks_count_set(sb, reserved_ratio *
ext2fs_blocks_count(sb) / 100.0);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
ext2fs_mark_super_dirty(fs);
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 08:46:34 +08:00
printf (_("Setting reserved blocks percentage to %g%% (%llu blocks)\n"),
reserved_ratio, ext2fs_r_blocks_count(sb));
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
}
ChangeLog, debugfs.8.in, debugfs.c: Add a -V option which displays the current version. ChangeLog, unix.c: unix.c (e2fsck_update_progress): Remove unused variables. ChangeLog, inode.c: inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup() is called early because of a missing inode table in a block group, the current_inode counter wasn't incremented correctly. ChangeLog, tst_uuid.c: tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter. ChangeLog, test_icount.c: test_icount.c (main): Fix main() declaration so that it returns int, not void. Many files: fsck.c (ignore): Remove unused variable cp. chattr.c (fatal_error): tune2fs.c (usage): lsattr.c (usage): dumpe2fs.c (usage): badblocks.c (usage): Remove volatile from declaration. fsck.c: Change use of strdup to be string_copy, since we don't trust what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 13:11:14 +08:00
if (r_flag) {
Merge branch 'maint' into next Conflicts: misc/tune2fs.c
2011-06-01 08:08:58 +08:00
if (reserved_blocks > ext2fs_blocks_count(sb)/2) {
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
com_err(program_name, 0,
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 08:46:34 +08:00
_("reserved blocks count is too big (%llu)"),
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
reserved_blocks);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
rc = 1;
goto closefs;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
}
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 08:46:34 +08:00
ext2fs_r_blocks_count_set(sb, reserved_blocks);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
ext2fs_mark_super_dirty(fs);
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count() Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-09-08 08:46:34 +08:00
printf(_("Setting reserved blocks count to %llu\n"),
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
reserved_blocks);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
}
Many files: Checked in e2fsprogs 1.08.
1997-04-30 01:48:10 +08:00
if (s_flag == 1) {
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (ext2fs_has_feature_sparse_super(sb)) {
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
fputs(_("\nThe filesystem already has sparse "
"superblocks.\n"), stderr);
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
} else if (ext2fs_has_feature_meta_bg(sb)) {
e2fsprogs: Disallow tune2fs enabling sparse_super with ext4 meta_bg enabled When meta_bg feature is enabled, group descriptor block is allocated every 128 block group (or every 64 block group if 64bit feature is enabled). In such situation, files in block group more than #128 will be removed if sparse_super feature is enabled with tune2fs and afterwards necessary e2fsck running. Because tune2fs does not reallocate group descriptor blocks but just set sparse_super feature. If ext4 has sparse_super, ext2fs_descriptor_block_loc2() called by e2fsck thinks the block group (e.g. #128) that it has group descriptor block at the head offset. But that offset is used as backup super block before. So e2fsck fixes ext4 based on invalid group descriptor blocks and this cause data lost. The patch avoids this problem simply by disallow tune2fs enabling sparse_super if meta_bg is enabled. Steps to reproduce: 1. Create ext4 which has meta_bg, ^sparse_super and 129+ block groups. # mke2fs -t ext4 -O meta_bg,^resize_inode,^sparse_super DEV 17G # mount DEV /MP 2. Create direcotry and files which use block group #128's metadata. # echo $((8192*128+1)) > /sys/fs/ext4/DEV/inode_goal # mkdir /MP/DIR # for i in $(seq 1 100); do dd if=/dev/urandom of=/MP/DIR/file$i bs=1024 count=10; done 3. Enable sparse_super with tune2fs then execute e2fsck. Data in block group #128 will be lost!! # umount DEV # tune2fs -O sparse_super DEV # e2fsck/e2fsck -yf DEV Signed-off-by: Akira Fujita <a-fujita@rs.jp.ne.cocm> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-02-07 04:11:52 +08:00
fputs(_("\nSetting the sparse superblock flag not "
"supported\nfor filesystems with "
"the meta_bg feature enabled.\n"),
stderr);
rc = 1;
goto closefs;
} else {
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
ext2fs_set_feature_sparse_super(sb);
ChangeLog, tune2fs.c: tune2fs.c (main): Add support to allow HAS_JOURNAL flag to be cleared, but only if the filesystem is unmounted or mounted read-only. Changed struct ext2fs_sb to struct ext2_super, and cleaned up old code which was needed for old versions of ext2_fs.h (not needed since we're using our own version now).
2001-01-01 23:26:58 +08:00
sb->s_state &= ~EXT2_VALID_FS;
Many files: Checked in e2fsprogs 1.08.
1997-04-30 01:48:10 +08:00
ext2fs_mark_super_dirty(fs);
Many files: badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c, get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c, nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add Internationalization support as suggested by Marco d'Itri <md@linux.it>.
2000-02-08 08:47:55 +08:00
printf(_("\nSparse superblock flag set. %s"),
.cvsignore, nyc.po: More i18n checkins. tune2fs.c: Fix some stupid i18n compilation bugs.
2000-02-09 05:35:41 +08:00
_(please_fsck));
Many files: Checked in e2fsprogs 1.08.
1997-04-30 01:48:10 +08:00
}
}
if (s_flag == 0) {
e2fsprogs: Disallow tune2fs enabling sparse_super with ext4 meta_bg enabled When meta_bg feature is enabled, group descriptor block is allocated every 128 block group (or every 64 block group if 64bit feature is enabled). In such situation, files in block group more than #128 will be removed if sparse_super feature is enabled with tune2fs and afterwards necessary e2fsck running. Because tune2fs does not reallocate group descriptor blocks but just set sparse_super feature. If ext4 has sparse_super, ext2fs_descriptor_block_loc2() called by e2fsck thinks the block group (e.g. #128) that it has group descriptor block at the head offset. But that offset is used as backup super block before. So e2fsck fixes ext4 based on invalid group descriptor blocks and this cause data lost. The patch avoids this problem simply by disallow tune2fs enabling sparse_super if meta_bg is enabled. Steps to reproduce: 1. Create ext4 which has meta_bg, ^sparse_super and 129+ block groups. # mke2fs -t ext4 -O meta_bg,^resize_inode,^sparse_super DEV 17G # mount DEV /MP 2. Create direcotry and files which use block group #128's metadata. # echo $((8192*128+1)) > /sys/fs/ext4/DEV/inode_goal # mkdir /MP/DIR # for i in $(seq 1 100); do dd if=/dev/urandom of=/MP/DIR/file$i bs=1024 count=10; done 3. Enable sparse_super with tune2fs then execute e2fsck. Data in block group #128 will be lost!! # umount DEV # tune2fs -O sparse_super DEV # e2fsck/e2fsck -yf DEV Signed-off-by: Akira Fujita <a-fujita@rs.jp.ne.cocm> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-02-07 04:11:52 +08:00
fputs(_("\nClearing the sparse superblock flag not supported.\n"),
tune2fs: Remove support for clearing the SPARSE_SUPER feature Clearing SPARSE_SUPER is dangerous; it can result in a filesystem which e2fsck can't fix easily. Since there is very few good reasons for wanting to turn this feature off, disable tune2fs's abiity to do this. Users who really want this can use debugfs. Also, deprecate the tune2fs -s option. Remove it from the man page and usage message. Addresses-Sourceforge-Bug: #1840286 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-29 10:26:01 +08:00
stderr);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
rc = 1;
goto closefs;
Many files: Checked in e2fsprogs 1.08.
1997-04-30 01:48:10 +08:00
}
tune2fs.8.in, tune2fs.c (parse_tune2fs_options, main): Add support for new option, -T, which allows the user to set the last checked time on the filesystem.
2001-12-26 21:58:01 +08:00
if (T_flag) {
sb->s_lastcheck = last_check_time;
ext2fs_mark_super_dirty(fs);
printf(_("Setting time filesystem last checked to %s\n"),
ctime(&last_check_time));
}
ChangeLog, tune2fs.c: tune2fs.c (main): Add support to allow HAS_JOURNAL flag to be cleared, but only if the filesystem is unmounted or mounted read-only. Changed struct ext2fs_sb to struct ext2_super, and cleaned up old code which was needed for old versions of ext2_fs.h (not needed since we're using our own version now).
2001-01-01 23:26:58 +08:00
if (u_flag) {
sb->s_def_resuid = resuid;
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
ext2fs_mark_super_dirty(fs);
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
printf(_("Setting reserved blocks uid to %lu\n"), resuid);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:34:30 +08:00
}
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
if (L_flag) {
Many files: e2label.c: Fix -Wall warning by making functions static. chattr.1.in: Document that the append-only attribute may only be set or cleared by the superuser. Update all manual pages to that the availability section is up-to-date. e2label.8.in, tune2fs.8.in: Update manual page to state that labels must be no longer than 16 characters, or they will be truncated. e2label.c (change_label), tune2fs.c (main): If the label is longer than 16 characters, print a warning message stating that the label will be truncated. mke2fs.c (PRS): If the user specifies a filesystem size, and it's larger than the apparent size of the device, print a warning message and ask if the user wants to proceed.
1998-03-30 09:20:55 +08:00
if (strlen(new_label) > sizeof(sb->s_volume_name))
Remove trailing whitespace for the entire source tree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-28 11:07:54 +08:00
fputs(_("Warning: label too long, truncating.\n"),
Fix gcc -Wall nitpicks
2003-12-07 14:28:50 +08:00
stderr);
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
memset(sb->s_volume_name, 0, sizeof(sb->s_volume_name));
strncpy(sb->s_volume_name, new_label,
sizeof(sb->s_volume_name));
ext2fs_mark_super_dirty(fs);
}
if (M_flag) {
memset(sb->s_last_mounted, 0, sizeof(sb->s_last_mounted));
strncpy(sb->s_last_mounted, new_last_mounted,
sizeof(sb->s_last_mounted));
ext2fs_mark_super_dirty(fs);
}
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
if (mntopts_cmd) {
rc = update_mntopts(fs, mntopts_cmd);
if (rc)
goto closefs;
}
if (features_cmd) {
rc = update_feature_set(fs, features_cmd);
if (rc)
goto closefs;
}
if (extended_cmd) {
rc = parse_extended_opts(fs, extended_cmd);
if (rc)
goto closefs;
if (clear_mmp && !f_flag) {
fputs(_("Error in using clear_mmp. "
"It must be used with -f\n"),
stderr);
goto closefs;
}
}
if (clear_mmp) {
rc = ext2fs_mmp_clear(fs);
goto closefs;
}
if (journal_size || journal_device) {
rc = add_journal(fs);
if (rc)
goto closefs;
}
Remove trailing whitespace for the entire source tree Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-28 11:07:54 +08:00
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
if (Q_flag) {
if (mount_flags & EXT2_MF_MOUNTED) {
fputs(_("The quota feature may only be changed when "
"the filesystem is unmounted.\n"), stderr);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
rc = 1;
goto closefs;
tune2fs: Add support for turning on quota feature This patch adds support for setting the quota feature in superblock and allows selectively creating quota inodes (user or group or both) in the superblock. Currently, modifying the quota feature is only supported when the filesystem is unmounted. Also, when setting the quota feature, tune2fs will use aquota.user or aquota.group file inode number in superblock if these files exist. Otherwise it will initialize empty quota inodes #3 and #4 and use them. Here is how it works: # Set quota feature and initialize both (user and group) quota inodes $ tune2fs -O quota /dev/ram1 # Enable only one type of quota $ tune2fs -Q usrquota /dev/ram1 # Enable grpquota, disable usrquota $ tune2fs -Q ^usrquota,grpquota /dev/ram1 # Clear quota feature and remove quota inodes $ tune2fs -O ^quota /dev/ram1 Signed-off-by: Aditya Kali <adityakali@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-07-21 02:40:05 +08:00
}
handle_quota_options(fs);
}
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
if (U_flag) {
tune2fs: Update the block group checksums when changing the UUID Since the block group checksums depend on the UUID, we need to update the block group checksums when setting the UUID. We only do so if all of the checksums are correct, however. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-11-15 06:42:27 +08:00
int set_csum = 0;
dgrp_t i;
misc: fix alignment warnings on ARM Some temporary char buffers allocated on the stack are not properly aligned when typecast to a structure containing __u32 or __u64 types, and this can cause alignment warnings on ARM and other alignment sensitive architectures, and potential slowdowns to do fixups. Fix the buffer alignment to avoid such issues. Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=680090 Reported-by: Gordan Bobic <gordan.bobic@gmail.com> Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-05-23 06:40:51 +08:00
char buf[SUPERBLOCK_SIZE] __attribute__ ((aligned(8)));
misc: quiet signed/unsigned charactr compiler warnings Quiet warnings about signed vs. unsigned character mismatch. Use __u8 for storing UUIDs instead of char to match the superblock s_uuid field. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-30 07:30:39 +08:00
__u8 old_uuid[UUID_SIZE];
tune2fs: Update the block group checksums when changing the UUID Since the block group checksums depend on the UUID, we need to update the block group checksums when setting the UUID. We only do so if all of the checksums are correct, however. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-11-15 06:42:27 +08:00
Merge branch 'maint' into next Conflicts: misc/tune2fs.c
2013-12-15 09:56:29 +08:00
if (ext2fs_has_group_desc_csum(fs)) {
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
/*
tune2fs: allow user to turn on saving the checksum seed Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-06 01:38:52 +08:00
* Changing the UUID on a metadata_csum FS requires
* rewriting all metadata, which can race with a
* mounted fs. Don't allow that unless we're saving
* the checksum seed.
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
*/
tune2fs: allow user to turn on saving the checksum seed Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-06 01:38:52 +08:00
if ((mount_flags & EXT2_MF_MOUNTED) &&
!ext2fs_has_feature_csum_seed(fs->super) &&
ext2fs_has_feature_metadata_csum(fs->super)) {
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
fputs(_("The UUID may only be "
"changed when the filesystem is "
"unmounted.\n"), stderr);
tune2fs: allow user to turn on saving the checksum seed Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-06 01:38:52 +08:00
fputs(_("If you only use kernels newer than "
"v4.4, run 'tune2fs -O "
"metadata_csum_seed' and re-run this "
"command.\n"), stderr);
try_confirm_csum_seed_support();
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
exit(1);
}
tune2fs: confirm dangerous operations Give admins a short amount of time to confirm that they want to proceed with a dangerous operation. Refuse to perform the op unless the filesystem is freshly checked. Cc: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-02-14 06:38:11 +08:00
if (!ext2fs_has_feature_csum_seed(fs->super))
check_fsck_needed(fs,
_("Setting UUID on a checksummed "
"filesystem could take some time."));
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
/*
tune2fs: Update the block group checksums when changing the UUID Since the block group checksums depend on the UUID, we need to update the block group checksums when setting the UUID. We only do so if all of the checksums are correct, however. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-11-15 06:42:27 +08:00
* Determine if the block group checksums are
* correct so we know whether or not to set
* them later on.
*/
for (i = 0; i < fs->group_desc_count; i++)
if (!ext2fs_group_desc_csum_verify(fs, i))
break;
if (i >= fs->group_desc_count)
set_csum = 1;
}
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
memcpy(old_uuid, sb->s_uuid, UUID_SIZE);
ChangeLog, tune2fs.c: tune2fs.c (remove_journal_device): If the force flag is given, tune2fs will remove the journal device information from the superblock even if tune2fs failed to open the journal device or otherwise other failed to remove the filesystem from journal device. (parse_tune2fs_options): Fix -j option so that it works (it was missing the open_flag being set to EXT2_FLAG_RW). (main): Accept "-U clear" to set a null UID.
2001-04-24 04:58:03 +08:00
if ((strcasecmp(new_UUID, "null") == 0) ||
(strcasecmp(new_UUID, "clear") == 0)) {
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
uuid_clear(sb->s_uuid);
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h: tune2fs.c (update_feature_set, add_journal): Moved to separate functions. Added ability to add and remove the journal while the filesystem is live. Added support for setting a time-based UUID. Removed zero-initialized static variables. mke2fs.c, util.c, util.h (strcasecmp, proceed_question, check_plausibility, parse_journal_opts, check_mount): Moved functions to util.c so they can be used by tune2fs. mke2fs.c (main): Change ext2fs_add_journal_fs() to ext2fs_add_journal_inode() to reflect function renaming.
2001-01-04 01:02:13 +08:00
} else if (strcasecmp(new_UUID, "time") == 0) {
uuid_generate_time(sb->s_uuid);
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
} else if (strcasecmp(new_UUID, "random") == 0) {
uuid_generate(sb->s_uuid);
} else if (uuid_parse(new_UUID, sb->s_uuid)) {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
com_err(program_name, 0, "%s",
_("Invalid UUID format\n"));
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
rc = 1;
goto closefs;
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
}
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
ext2fs_init_csum_seed(fs);
tune2fs: Update the block group checksums when changing the UUID Since the block group checksums depend on the UUID, we need to update the block group checksums when setting the UUID. We only do so if all of the checksums are correct, however. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-11-15 06:42:27 +08:00
if (set_csum) {
for (i = 0; i < fs->group_desc_count; i++)
ext2fs_group_desc_csum_set(fs, i);
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
}
tune2fs: update journal super block when changing UUID for fs. Using -U option you can change the UUID for fs, however it will not work for journal device, since it have a copy of this UUID inside jsb (i.e. journal super block). So copy UUID on change into that block. Here is the initial thread: http://comments.gmane.org/gmane.comp.file-systems.ext4/44532 You can reproduce this by executing following commands: $ fallocate -l100M /tmp/dev $ fallocate -l100M /tmp/journal $ sudo /sbin/losetup /dev/loop1 /tmp/dev $ sudo /sbin/losetup /dev/loop0 /tmp/journal $ mke2fs -O journal_dev /tmp/journal $ tune2fs -U da1f2ed0-60f6-aaaa-92fd-738701418523 /tmp/journal $ sudo mke2fs -t ext4 -J device=/dev/loop0 /dev/loop1 $ dumpe2fs -h /tmp/dev | fgrep UUID dumpe2fs 1.43-WIP (18-May-2014) Filesystem UUID: 8a776be9-12eb-411f-8e88-b873575ecfb6 Journal UUID: e3d02151-e776-4865-af25-aecb7291e8e5 $ sudo e2fsck /dev/vdc e2fsck 1.43-WIP (18-May-2014) External journal does not support this filesystem /dev/loop1: ********** WARNING: Filesystem still has errors ********** Reported-by: Chin Tzung Cheng <chintzung@gmail.com> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Reviewed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:24 +08:00
/* If this is a journal dev, we need to copy UUID into jsb */
if (!(rc = get_journal_sb(fs, buf))) {
journal_superblock_t *jsb;
jsb = (journal_superblock_t *) buf;
fputs(_("Need to update journal superblock.\n"), stdout);
memcpy(jsb->s_uuid, sb->s_uuid, sizeof(sb->s_uuid));
/* Writeback the journal superblock */
if ((rc = io_channel_write_blk64(fs->io,
ext2fs_journal_sb_start(fs->blocksize),
-SUPERBLOCK_SIZE, buf)))
goto closefs;
} else if (rc != EXT2_ET_UNSUPP_FEATURE)
goto closefs;
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
else {
tune2fs: update journal super block when changing UUID for fs. Using -U option you can change the UUID for fs, however it will not work for journal device, since it have a copy of this UUID inside jsb (i.e. journal super block). So copy UUID on change into that block. Here is the initial thread: http://comments.gmane.org/gmane.comp.file-systems.ext4/44532 You can reproduce this by executing following commands: $ fallocate -l100M /tmp/dev $ fallocate -l100M /tmp/journal $ sudo /sbin/losetup /dev/loop1 /tmp/dev $ sudo /sbin/losetup /dev/loop0 /tmp/journal $ mke2fs -O journal_dev /tmp/journal $ tune2fs -U da1f2ed0-60f6-aaaa-92fd-738701418523 /tmp/journal $ sudo mke2fs -t ext4 -J device=/dev/loop0 /dev/loop1 $ dumpe2fs -h /tmp/dev | fgrep UUID dumpe2fs 1.43-WIP (18-May-2014) Filesystem UUID: 8a776be9-12eb-411f-8e88-b873575ecfb6 Journal UUID: e3d02151-e776-4865-af25-aecb7291e8e5 $ sudo e2fsck /dev/vdc e2fsck 1.43-WIP (18-May-2014) External journal does not support this filesystem /dev/loop1: ********** WARNING: Filesystem still has errors ********** Reported-by: Chin Tzung Cheng <chintzung@gmail.com> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Reviewed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:24 +08:00
rc = 0; /** Reset rc to avoid ext2fs_mmp_stop() */
tune2fs: update journal users while updating fs UUID (with external journal) When we have fs with external journal device, and updating it's UUID, we should update UUID in users list for that external journal device. Before: $ tune2fs -U clear /tmp/dev tune2fs 1.42.10 (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 0ad849df-1041-4f0a-b1c1-2f949d6a1e37 After: $ sudo tune2fs -U clear /tmp/dev tune2fs 1.43-WIP (18-May-2014) $ dumpe2fs /tmp/dev | fgrep UUID dumpe2fs 1.42.10 (18-May-2014) Filesystem UUID: <none> Journal UUID: da1f2ed0-60f6-aaaa-92fd-738701418523 $ dumpe2fs /tmp/journal | fgrep users -A10 dumpe2fs 1.42.10 (18-May-2014) Journal number of users: 2 Journal users: 0707762d-638e-4bc6-944e-ae8ee7a3359e 00000000-0000-0000-0000-000000000000 Also add some consts to avoid *magic numbers*: - UUID_STR_SIZE - UUID_SIZE - JFS_USERS_MAX - JFS_USERS_SIZE Proposed-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-07-28 15:43:25 +08:00
if ((rc = fs_update_journal_user(sb, old_uuid)))
goto closefs;
}
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
ext2fs_mark_super_dirty(fs);
tune2fs: allow user to turn on saving the checksum seed Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-06 01:38:52 +08:00
if (ext2fs_has_feature_metadata_csum(fs->super) &&
!ext2fs_has_feature_csum_seed(fs->super))
tune2fs: add inode checksum support This patch adds to tune2fs the ability to toggle the metadata checksum rocompat feature flag, which will rewrite the inode table with checksums. Disallow changing the UUID while the fs is mounted, because rewriting the metadata objects is racy. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2012-07-31 06:50:04 +08:00
rewrite_checksums = 1;
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
}
tune2fs: rewrite metadata checksums when resizing inode size When we use tune2fs -I new_ino_size to change inode size, if everything is OK, the corresponding ext4_group_desc.bg_free_blocks_count will be decreased, so obviously, we need to re-compute the group descriptor checksums, and the inode 's size has also changed, we also need to recompute the checksums of inodes for metadata_csum filesystem, so here we choose to call a rewrite_metadata_checksums(), this will fix checksum issues. Meanwhile, the patch will trigger an existing memory write overflow, which will casue segfault, please see the next patch. Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-12-03 11:29:29 +08:00
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
if (I_flag) {
if (mount_flags & EXT2_MF_MOUNTED) {
fputs(_("The inode size may only be "
"changed when the filesystem is "
"unmounted.\n"), stderr);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
rc = 1;
goto closefs;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
}
misc: clean up feature test macros with predicate functions Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-10-24 13:23:01 +08:00
if (ext2fs_has_feature_flex_bg(fs->super)) {
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
fputs(_("Changing the inode size not supported for "
"filesystems with the flex_bg\n"
"feature enabled.\n"),
tune2fs: Don't allow the -I option if the flex_bg feature is enabled With flex_bg usually the inode table for most block groups are packed right against each other, so expanding the inode table size needs special handling that's not currently in tune2fs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 14:50:07 +08:00
stderr);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
rc = 1;
goto closefs;
tune2fs: Don't allow the -I option if the flex_bg feature is enabled With flex_bg usually the inode table for most block groups are packed right against each other, so expanding the inode table size needs special handling that's not currently in tune2fs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 14:50:07 +08:00
}
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
/*
* We want to update group descriptor also
* with the new free inode count
*/
tune2fs: disable csum verification before resizing inode When we're turning on metadata checksumming /and/ resizing the inode at the same time, disable checksum verification during the resize_inode() call because the subroutines it calls will try to verify the checksums (which have not yet been set), causing the operation to fail unnecessarily. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:04 +08:00
if (rewrite_checksums)
fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
tune2fs: disable csum verification before resizing inode When we're turning on metadata checksumming /and/ resizing the inode at the same time, disable checksum verification during the resize_inode() call because the subroutines it calls will try to verify the checksums (which have not yet been set), causing the operation to fail unnecessarily. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:04 +08:00
retval = resize_inode(fs, new_inode_size);
if (rewrite_checksums)
fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS;
if (retval == 0) {
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
printf(_("Setting inode size %lu\n"),
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
new_inode_size);
tune2fs: rewrite metadata checksums when resizing inode size When we use tune2fs -I new_ino_size to change inode size, if everything is OK, the corresponding ext4_group_desc.bg_free_blocks_count will be decreased, so obviously, we need to re-compute the group descriptor checksums, and the inode 's size has also changed, we also need to recompute the checksums of inodes for metadata_csum filesystem, so here we choose to call a rewrite_metadata_checksums(), this will fix checksum issues. Meanwhile, the patch will trigger an existing memory write overflow, which will casue segfault, please see the next patch. Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-12-03 11:29:29 +08:00
rewrite_checksums = 1;
tune2fs: handle inode and/or block bitmap read failures in resize_inode() Handle these failures in resize_inode, and handle the propagated error in the caller. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-17 04:49:37 +08:00
} else {
build: quiet LLVM non-literal string format warning Compiling with LLVM generates a large number of warnings due to the use of _() for wrapping strings for i18n: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ./nls-enable.h:4:14: note: expanded from macro '_' #define _(a) (gettext (a)) ^~~~~~~~~~~~ These warnings are fixed by using "%s" as the format string, and then _() is used as the string argument. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2013-12-16 11:11:40 +08:00
printf("%s", _("Failed to change inode size\n"));
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
rc = 1;
goto closefs;
tune2fs: Support for large inode migration. Add new option -I <inode_size> to tune2fs. This is used to change the inode size. The size need to be multiple of 2 and we don't allow to decrease the inode size. As a part of increasing the inode size we increase the inode table size. We also move the used data blocks around and update the respective inodes to point to the new block tune2fs uses the undo I/O manager when migrating to large inode. This helps in reverting the changes if end results are not correct. The environment variable TUNE2FS_UNDO_DIR is used to indicate the directory within which the tdb file need to be created. The file will be named tune2fs-<device-name> If TUNE2FS_UNDO_DIR is not set /var/lib/e2fsprogs is used Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-08-13 18:26:24 +08:00
}
}
Many files: Checked in e2fsprogs 1.05
1997-04-29 22:53:37 +08:00
tune2fs: rewrite metadata checksums when resizing inode size When we use tune2fs -I new_ino_size to change inode size, if everything is OK, the corresponding ext4_group_desc.bg_free_blocks_count will be decreased, so obviously, we need to re-compute the group descriptor checksums, and the inode 's size has also changed, we also need to recompute the checksums of inodes for metadata_csum filesystem, so here we choose to call a rewrite_metadata_checksums(), this will fix checksum issues. Meanwhile, the patch will trigger an existing memory write overflow, which will casue segfault, please see the next patch. Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2014-12-03 11:29:29 +08:00
if (rewrite_checksums)
rewrite_metadata_checksums(fs);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
if (l_flag)
tune2fs: General (whitespace) cleanup Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-01-20 15:34:39 +08:00
list_super(sb);
Add support for setting RAID stride and strip-width via mke2fs and tune2fs This is useful for mballoc to align block allocation on the RAID stripe boundaries. Signed-off-by: Rupesh Thakare <rupesh@clusterfs.com> Signed-off-by: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-02-19 11:56:25 +08:00
if (stride_set) {
sb->s_raid_stride = stride;
ext2fs_mark_super_dirty(fs);
printf(_("Setting stride size to %d\n"), stride);
}
if (stripe_width_set) {
sb->s_raid_stripe_width = stripe_width;
ext2fs_mark_super_dirty(fs);
printf(_("Setting stripe width to %d\n"), stripe_width);
}
tune2fs: Fix mount_opts handling The extended options parsing for mount_opts was horribly buggy. Invalid mount options that had an argument would get interpreted as an extended mount options. Fix this. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-07-05 08:14:35 +08:00
if (ext_mount_opts) {
misc: quiet minor compiler errors Several compiler errors are quieted: - zero-length gnu_printf format string - unused variable - uninitalized variable (though it isn't actually used for anything) - fixed a bug in ext2fs_stat() if stat64() does not exist Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 00:59:31 +08:00
strncpy((char *)(fs->super->s_mount_opts), ext_mount_opts,
tune2fs: Fix mount_opts handling The extended options parsing for mount_opts was horribly buggy. Invalid mount options that had an argument would get interpreted as an extended mount options. Fix this. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2011-07-05 08:14:35 +08:00
sizeof(fs->super->s_mount_opts));
fs->super->s_mount_opts[sizeof(fs->super->s_mount_opts)-1] = 0;
ext2fs_mark_super_dirty(fs);
printf(_("Setting extended default mount options to '%s'\n"),
ext_mount_opts);
free(ext_mount_opts);
}
tune2fs: warn if the filesystem journal is dirty Running tune2fs on a filesystem with an unrecovered journal can cause the tune2fs settings changes in the superblock to be reverted when the journal is replayed if it contains an uncommitted copy of the superblock. Print a warning if this is detected so that the user isn't surprised if it happens. Signed-off-by: Jim Garlick <garlick@llnl.gov> Updated message printed to include steps to replay journal. Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-12-01 01:13:39 +08:00
tune2fs: don't include journal recovery when building for Android Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-19 04:07:34 +08:00
#ifdef NO_RECOVERY
/* Warn if file system needs recovery and it is opened for writing. */
if ((open_flag & EXT2_FLAG_RW) && !(mount_flags & EXT2_MF_MOUNTED) &&
(sb->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) &&
(sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER)) {
fprintf(stderr,
_("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"
"\te2fsck -E journal_only %s\n\n"
"then rerun this command. Otherwise, any changes made may be overwritten\n"
"by journal recovery.\n"), device_name);
}
#else
tune2fs: recover the journal If the journal needs to be recovered to avoid clobbering whatever changes tune2fs makes, do so. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-02-14 06:38:17 +08:00
/* Recover the journal if possible. */
tune2fs: warn if the filesystem journal is dirty Running tune2fs on a filesystem with an unrecovered journal can cause the tune2fs settings changes in the superblock to be reverted when the journal is replayed if it contains an uncommitted copy of the superblock. Print a warning if this is detected so that the user isn't surprised if it happens. Signed-off-by: Jim Garlick <garlick@llnl.gov> Updated message printed to include steps to replay journal. Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-12-01 01:13:39 +08:00
if ((open_flag & EXT2_FLAG_RW) && !(mount_flags & EXT2_MF_MOUNTED) &&
tune2fs: recover the journal If the journal needs to be recovered to avoid clobbering whatever changes tune2fs makes, do so. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-02-14 06:38:17 +08:00
ext2fs_has_feature_journal_needs_recovery(fs->super)) {
errcode_t err;
printf(_("Recovering journal.\n"));
err = ext2fs_run_ext3_journal(&fs);
if (err) {
com_err("tune2fs", err, "while recovering journal.\n");
printf(_("Please run e2fsck -fy %s.\n"), argv[1]);
goto closefs;
}
ext2fs_clear_feature_journal_needs_recovery(fs->super);
ext2fs_mark_super_dirty(fs);
tune2fs: warn if the filesystem journal is dirty Running tune2fs on a filesystem with an unrecovered journal can cause the tune2fs settings changes in the superblock to be reverted when the journal is replayed if it contains an uncommitted copy of the superblock. Print a warning if this is detected so that the user isn't surprised if it happens. Signed-off-by: Jim Garlick <garlick@llnl.gov> Updated message printed to include steps to replay journal. Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-12-01 01:13:39 +08:00
}
tune2fs: don't include journal recovery when building for Android Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2016-03-19 04:07:34 +08:00
#endif
tune2fs: warn if the filesystem journal is dirty Running tune2fs on a filesystem with an unrecovered journal can cause the tune2fs settings changes in the superblock to be reverted when the journal is replayed if it contains an uncommitted copy of the superblock. Print a warning if this is detected so that the user isn't surprised if it happens. Signed-off-by: Jim Garlick <garlick@llnl.gov> Updated message printed to include steps to replay journal. Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-12-01 01:13:39 +08:00
dumpe2fs, tune2fs: fix miscellaneous memory leaks Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-06-15 15:53:04 +08:00
free(device_name);
Use the newer add/remove_error_table com_err interfaces Change all of the e2fsprogs programs to use the newer add_error_table() and remove_error_table() interfaces instead of the much older initialize_*_error_table() function. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2006-12-26 16:38:07 +08:00
remove_error_table(&et_ext2_error_table);
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
closefs:
if (rc) {
ext2fs_mmp_stop(fs);
tune2fs: allow tune2fs to be built as a static library for Android Sync up with aosp's e2fsprogs commits: d25948b9b4a9e361ef071dc8175df0407f60b7e0 e59f7c7cedb1e07eb4dbbb66e115c14faea19f19 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-07-13 05:39:26 +08:00
#ifndef BUILD_AS_LIB
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
exit(1);
tune2fs: allow tune2fs to be built as a static library for Android Sync up with aosp's e2fsprogs commits: d25948b9b4a9e361ef071dc8175df0407f60b7e0 e59f7c7cedb1e07eb4dbbb66e115c14faea19f19 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-07-13 05:39:26 +08:00
#endif
ext2fs: add multi-mount protection (INCOMPAT_MMP) Multi-mount protection is feature that allows mke2fs, e2fsck, and others to detect if the filesystem is mounted on a remote node (on SAN disks) and avoid corrupting the filesystem. For e2fsprogs this means that it checks the MMP block to see if the filesystem is in use, and marks the filesystem busy while e2fsck is running on the system. This is useful on SAN disks that are shared between high-availability servers, or accessible by multiple nodes that aren't in HA pairs. MMP isn't intended to serve as a primary HA exclusion mechanism, but as a failsafe to protect against user, software, or hardware errors. There is no requirement that e2fsck updates the MMP block at regular intervals, but e2fsck does this occasionally to provide useful information to the sysadmin in case of a detected conflict. For the kernel (since Linux 3.0) MMP adds a "heartbeat" mechanism to periodically write to disk (every few seconds by default) to notify other nodes that the filesystem is still in use and unsafe to modify. Originally-by: Kalpak Shah <kalpak@clusterfs.com> Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2011-09-25 01:48:55 +08:00
}
tune2fs: direct user to resize2fs for 64bit conversion If the user tries to enable or disable the 64bit feature via tune2fs, tell them how to use resize2fs to effect the conversion. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2015-01-28 02:11:47 +08:00
convert_64bit(fs, feature_64bit);
e2fsprogs: introduce ext2fs_close_free() helper Currently there are many uses of ext2fs_close() which might be wrong. First of all ext2fs_close() does not set the ext2_filsys pointer to NULL so the caller is responsible for clearing it, however there are some cases there we do not do it. Second of all very small number of users of ext2fs_close() actually check the return value. If there is a problem in ext2fs_close() it will not even free the ext2_filsys structure, but majority of users expect it to do so. To fix both problems this commit introduces a new helper ext2fs_close_free() which will not only check for the return value and free the ext2_filsys structure if the call to ext2fs_close2() failed, but it will also set the ext2_filsys pointer to NULL. Replace every use of ext2fs_close() in e2fsprogs tools with ext2fs_close_free() - there is no real reason to keep using ext2fs_close(). Signed-off-by: Lukas Czerner <lczerner@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
2014-07-06 09:06:29 +08:00
return (ext2fs_close_free(&fs) ? 1 : 0);
Many files: Checkin of e2fsprogs 0.5b
1997-04-26 21:21:57 +08:00
}
Reference in New Issue Copy Permalink