[PATCH] tmpfs 1/5 shmem_rename fixes

• Next message: Hugh Dickins: "[PATCH] tmpfs 2/5 shmem_symlink like 2.5/ac"
• Previous message: Ingo Molnar: "[patch] exit-thread-2.5.34-A0, BK-curr"
• Next in thread: Hugh Dickins: "[PATCH] tmpfs 2/5 shmem_symlink like 2.5/ac"
• Reply: Hugh Dickins: "[PATCH] tmpfs 2/5 shmem_symlink like 2.5/ac"
• Reply: Hugh Dickins: "[PATCH] tmpfs 3/5 pretend dirent size"
• Reply: Hugh Dickins: "[PATCH] tmpfs 4/5 three trivia"
• Reply: Hugh Dickins: "[PATCH] tmpfs 5/5 closer to 2.5/ac"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

shmem_rename still didn't get parent directory link count quite right,
in the case where you rename a directory in place of an empty directory
(with rename syscall: doesn't happen like that with mv command); and it
forgot to update new directory's ctime and mtime.

--- 2.4.20-pre7/mm/shmem.c Fri Sep 13 10:28:10 2002
+++ tmpfs1/mm/shmem.c Sat Sep 14 18:21:23 2002
@@ -1124,24 +1124,24 @@
  */
 static int shmem_rename(struct inode * old_dir, struct dentry *old_dentry, struct inode * new_dir,struct dentry *new_dentry)
 {
- struct inode *inode;
+ struct inode *inode = old_dentry->d_inode;
+ int they_are_dirs = S_ISDIR(inode->i_mode);
 
         if (!shmem_empty(new_dentry))
                 return -ENOTEMPTY;
 
- inode = new_dentry->d_inode;
- if (inode) {
- inode->i_ctime = CURRENT_TIME;
- inode->i_nlink--;
- dput(new_dentry);
- }
- inode = old_dentry->d_inode;
- if (S_ISDIR(inode->i_mode)) {
+ if (new_dentry->d_inode) {
+ (void) shmem_unlink(new_dir, new_dentry);
+ if (they_are_dirs)
+ old_dir->i_nlink--;
+ } else if (they_are_dirs) {
                 old_dir->i_nlink--;
                 new_dir->i_nlink++;
         }
 
- inode->i_ctime = old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME;
+ old_dir->i_ctime = old_dir->i_mtime =
+ new_dir->i_ctime = new_dir->i_mtime =
+ inode->i_ctime = CURRENT_TIME;
         return 0;
 }
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

• Next message: Hugh Dickins: "[PATCH] tmpfs 2/5 shmem_symlink like 2.5/ac"
• Previous message: Ingo Molnar: "[patch] exit-thread-2.5.34-A0, BK-curr"
• Next in thread: Hugh Dickins: "[PATCH] tmpfs 2/5 shmem_symlink like 2.5/ac"
• Reply: Hugh Dickins: "[PATCH] tmpfs 2/5 shmem_symlink like 2.5/ac"
• Reply: Hugh Dickins: "[PATCH] tmpfs 3/5 pretend dirent size"
• Reply: Hugh Dickins: "[PATCH] tmpfs 4/5 three trivia"
• Reply: Hugh Dickins: "[PATCH] tmpfs 5/5 closer to 2.5/ac"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Sun Sep 15 2002 - 22:00:37 EST