ChangeLog, setsuper.c:

  Remove hard-coded s_ from inode_size field.
ChangeLog, dump.c:
  dump.c (fix_perms): Fix bug for systems which don't have fchown; was
  	incorrectly using chmod instead of chown.

diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index 76e2d95..62ce6ab 100644 (file)
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,7 +1,11 @@
 2000-12-30    <tytso@snap.thunk.org>
 
+       * dump.c (fix_perms): Fix bug for systems which don't have fchown;
+               was incorrectly using chmod instead of chown.
+
        * setsuper.c (find_field): Strip the s_prefix if given for ssv
-               fields.   (Suggested by Andreas Dilger)
+               fields.  Remove hard-coded s_ from inode_size
+               field.  (Suggested by Andreas Dilger)
 
        * debugfs.c (do_modify_inode): Add the ability to set the inode
                generation number.  (Suggested by Andreas Dilger)

diff --git a/debugfs/dump.c b/debugfs/dump.c
index 55aa4ac..e946437 100644 (file)
--- a/debugfs/dump.c
+++ b/debugfs/dump.c
@@ -75,7 +75,7 @@ static void fix_perms(const char *cmd, const struct ext2_inode *inode,
                com_err(cmd, errno, "while setting permissions of %s", name);
 
 #ifndef HAVE_FCHOWN
-       i = chmod(name, inode->i_uid, inode->i_gid);
+       i = chown(name, inode->i_uid, inode->i_gid);
 #else
        if (fd != -1)
                i = fchown(fd, inode->i_uid, inode->i_gid);

diff --git a/debugfs/setsuper.c b/debugfs/setsuper.c
index d8a724a..ae20e08 100644 (file)
--- a/debugfs/setsuper.c
+++ b/debugfs/setsuper.c
@@ -58,7 +58,7 @@ static struct super_set_info super_fields[] = {
        { "def_resuid", &set_sb.s_def_resuid, 2, parse_uint },
        { "def_resgid", &set_sb.s_def_resgid, 2, parse_uint },
        { "first_ino", &set_sb.s_first_ino, 4, parse_uint },
-       { "s_inode_size", &set_sb.  s_inode_size, 2, parse_uint },
+       { "inode_size", &set_sb.  s_inode_size, 2, parse_uint },
        { "block_group_nr", &set_sb.s_block_group_nr, 2, parse_uint },
        { "feature_compat", &set_sb.s_feature_compat, 4, parse_uint },
        { "feature_incompat", &set_sb.s_feature_incompat, 4, parse_uint },