2009-06-18 22:45:03

by Andrew Morton

[permalink] [raw]
Subject: [merged] ext2-do-not-update-mtime-of-a-moved-directory.patch removed from -mm tree

The patch titled
ext2: Do not update mtime of a moved directory
has been removed from the -mm tree. Its filename was

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

Subject: ext2: Do not update mtime of a moved directory
From: Jan Kara <[email protected]>

One of our users is complaining that his backup tool is upset on ext2
(while it's happy on ext3, xfs, ...) because of the mtime change.

The problem is:

mkdir foo
mkdir bar
mkdir foo/a

Now under ext2:
mv foo/a foo/b

changes mtime of 'foo/a' (foo/b after the move). That does not really
make sence and it does not happen under any other filesystem I've seen.

More complicated is:
mv foo/a bar/a

This changes mtime of foo/a (bar/a after the move) and it makes some sence
since we had to update parent directory pointer of foo/a. But again, no
other filesystem does this. So after some thoughts I'd vote for consistency
and change ext2 to behave the same as other filesystems.

Do not update mtime of a moved directory. Specs don't say anything
about it (neither that it should, nor that it should not be updated)
and other common filesystems (ext3, ext4, xfs, reiserfs, fat, ...)
don't do it. So let's become more consistent.

Spotted by [email protected], initial fix by J?rn Engel.

Reported-by: <[email protected]>
Cc: <[email protected]>
Cc: J?rn Engel <[email protected]>
Signed-off-by: Jan Kara <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

fs/ext2/dir.c | 5 +++--
fs/ext2/ext2.h | 2 +-
fs/ext2/namei.c | 5 +++--
3 files changed, 7 insertions(+), 5 deletions(-)

diff -puN fs/ext2/dir.c~ext2-do-not-update-mtime-of-a-moved-directory fs/ext2/dir.c
--- a/fs/ext2/dir.c~ext2-do-not-update-mtime-of-a-moved-directory
+++ a/fs/ext2/dir.c
@@ -450,7 +450,7 @@ ino_t ext2_inode_by_name(struct inode *d

/* Releases the page */
void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de,
- struct page *page, struct inode *inode)
+ struct page *page, struct inode *inode, int update_times)
loff_t pos = page_offset(page) +
(char *) de - (char *) page_address(page);
@@ -465,7 +465,8 @@ void ext2_set_link(struct inode *dir, st
ext2_set_de_type(de, inode);
err = ext2_commit_chunk(page, pos, len);
- dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
+ if (update_times)
+ dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
diff -puN fs/ext2/ext2.h~ext2-do-not-update-mtime-of-a-moved-directory fs/ext2/ext2.h
--- a/fs/ext2/ext2.h~ext2-do-not-update-mtime-of-a-moved-directory
+++ a/fs/ext2/ext2.h
@@ -111,7 +111,7 @@ extern struct ext2_dir_entry_2 * ext2_fi
extern int ext2_delete_entry (struct ext2_dir_entry_2 *, struct page *);
extern int ext2_empty_dir (struct inode *);
extern struct ext2_dir_entry_2 * ext2_dotdot (struct inode *, struct page **);
-extern void ext2_set_link(struct inode *, struct ext2_dir_entry_2 *, struct page *, struct inode *);
+extern void ext2_set_link(struct inode *, struct ext2_dir_entry_2 *, struct page *, struct inode *, int);

/* ialloc.c */
extern struct inode * ext2_new_inode (struct inode *, int);
diff -puN fs/ext2/namei.c~ext2-do-not-update-mtime-of-a-moved-directory fs/ext2/namei.c
--- a/fs/ext2/namei.c~ext2-do-not-update-mtime-of-a-moved-directory
+++ a/fs/ext2/namei.c
@@ -320,7 +320,7 @@ static int ext2_rename (struct inode * o
if (!new_de)
goto out_dir;
- ext2_set_link(new_dir, new_de, new_page, old_inode);
+ ext2_set_link(new_dir, new_de, new_page, old_inode, 1);
new_inode->i_ctime = CURRENT_TIME_SEC;
if (dir_de)
@@ -352,7 +352,8 @@ static int ext2_rename (struct inode * o

if (dir_de) {
- ext2_set_link(old_inode, dir_de, dir_page, new_dir);
+ if (old_dir != new_dir)
+ ext2_set_link(old_inode, dir_de, dir_page, new_dir, 0);
return 0;

Patches currently in -mm which might be from [email protected] are