From: Dave Hansen <haveblue@us.ibm.com>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, hch@infradead.org,
Dave Hansen <haveblue@us.ibm.com>
Subject: [PATCH 6/6] monitor zeroing of i_nlink
Date: Wed, 09 Aug 2006 09:57:34 -0700 [thread overview]
Message-ID: <20060809165734.B81884DC@localhost.localdomain> (raw)
In-Reply-To: <20060809165729.FE36B262@localhost.localdomain>
Some filesystems, instead of simply decrementing i_nlink, simply zero
it during an unlink operation. We need to catch these in addition
to the decrement operations.
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---
kernel/fork.c | 0
lxc-dave/fs/autofs4/root.c | 4 ++--
lxc-dave/fs/cifs/inode.c | 2 +-
lxc-dave/fs/ext3/namei.c | 2 +-
lxc-dave/fs/fuse/dir.c | 4 ++--
lxc-dave/fs/hfs/dir.c | 2 +-
lxc-dave/fs/hfsplus/dir.c | 4 ++--
lxc-dave/fs/hpfs/namei.c | 4 ++--
lxc-dave/fs/jfs/namei.c | 2 +-
lxc-dave/fs/msdos/namei.c | 4 ++--
lxc-dave/fs/nfs/dir.c | 2 +-
lxc-dave/fs/qnx4/namei.c | 2 +-
lxc-dave/fs/reiserfs/namei.c | 4 ++--
lxc-dave/fs/udf/namei.c | 2 +-
lxc-dave/fs/vfat/namei.c | 4 ++--
lxc-dave/include/linux/fs.h | 5 +++++
16 files changed, 26 insertions(+), 21 deletions(-)
diff -puN fs/libfs.c~B6-monitor-clear-i_nlink fs/libfs.c
diff -puN fs/cifs/inode.c~B6-monitor-clear-i_nlink fs/cifs/inode.c
--- lxc/fs/cifs/inode.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:54.000000000 -0700
+++ lxc-dave/fs/cifs/inode.c 2006-08-08 09:18:57.000000000 -0700
@@ -819,7 +819,7 @@ int cifs_rmdir(struct inode *inode, stru
if (!rc) {
drop_nlink(inode);
i_size_write(direntry->d_inode,0);
- direntry->d_inode->i_nlink = 0;
+ clear_nlink(direntry->d_inode);
}
cifsInode = CIFS_I(direntry->d_inode);
diff -puN fs/ext3/namei.c~B6-monitor-clear-i_nlink fs/ext3/namei.c
--- lxc/fs/ext3/namei.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:54.000000000 -0700
+++ lxc-dave/fs/ext3/namei.c 2006-08-08 09:18:57.000000000 -0700
@@ -2045,7 +2045,7 @@ static int ext3_rmdir (struct inode * di
"empty directory has nlink!=2 (%d)",
inode->i_nlink);
inode->i_version++;
- inode->i_nlink = 0;
+ clear_nlink(inode);
/* There's no need to set i_disksize: the fact that i_nlink is
* zero will ensure that the right thing happens during any
* recovery. */
diff -puN fs/autofs4/root.c~B6-monitor-clear-i_nlink fs/autofs4/root.c
--- lxc/fs/autofs4/root.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:54.000000000 -0700
+++ lxc-dave/fs/autofs4/root.c 2006-08-08 09:18:57.000000000 -0700
@@ -638,7 +638,7 @@ static int autofs4_dir_unlink(struct ino
dput(ino->dentry);
dentry->d_inode->i_size = 0;
- dentry->d_inode->i_nlink = 0;
+ clear_nlink(dentry->d_inode);
dir->i_mtime = CURRENT_TIME;
@@ -673,7 +673,7 @@ static int autofs4_dir_rmdir(struct inod
}
dput(ino->dentry);
dentry->d_inode->i_size = 0;
- dentry->d_inode->i_nlink = 0;
+ clear_nlink(dentry->d_inode);
if (dir->i_nlink)
drop_nlink(dir);
diff -puN fs/fuse/dir.c~B6-monitor-clear-i_nlink fs/fuse/dir.c
--- lxc/fs/fuse/dir.c~B6-monitor-clear-i_nlink 2006-08-06 03:21:02.000000000 -0700
+++ lxc-dave/fs/fuse/dir.c 2006-08-08 09:18:57.000000000 -0700
@@ -508,7 +508,7 @@ static int fuse_unlink(struct inode *dir
/* Set nlink to zero so the inode can be cleared, if
the inode does have more links this will be
discovered at the next lookup/getattr */
- inode->i_nlink = 0;
+ clear_nlink(inode);
fuse_invalidate_attr(inode);
fuse_invalidate_attr(dir);
fuse_invalidate_entry_cache(entry);
@@ -534,7 +534,7 @@ static int fuse_rmdir(struct inode *dir,
err = req->out.h.error;
fuse_put_request(fc, req);
if (!err) {
- entry->d_inode->i_nlink = 0;
+ clear_nlink(entry->d_inode);
fuse_invalidate_attr(dir);
fuse_invalidate_entry_cache(entry);
} else if (err == -EINTR)
diff -puN fs/hfs/dir.c~B6-monitor-clear-i_nlink fs/hfs/dir.c
--- lxc/fs/hfs/dir.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:52.000000000 -0700
+++ lxc-dave/fs/hfs/dir.c 2006-08-08 09:18:57.000000000 -0700
@@ -273,7 +273,7 @@ static int hfs_rmdir(struct inode *dir,
res = hfs_cat_delete(inode->i_ino, dir, &dentry->d_name);
if (res)
return res;
- inode->i_nlink = 0;
+ clear_nlink(inode);
inode->i_ctime = CURRENT_TIME_SEC;
hfs_delete_inode(inode);
mark_inode_dirty(inode);
diff -puN fs/hfsplus/dir.c~B6-monitor-clear-i_nlink fs/hfsplus/dir.c
--- lxc/fs/hfsplus/dir.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:54.000000000 -0700
+++ lxc-dave/fs/hfsplus/dir.c 2006-08-08 09:18:57.000000000 -0700
@@ -348,7 +348,7 @@ static int hfsplus_unlink(struct inode *
} else
inode->i_flags |= S_DEAD;
} else
- inode->i_nlink = 0;
+ clear_nlink(inode);
inode->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(inode);
@@ -387,7 +387,7 @@ static int hfsplus_rmdir(struct inode *d
res = hfsplus_delete_cat(inode->i_ino, dir, &dentry->d_name);
if (res)
return res;
- inode->i_nlink = 0;
+ clear_nlink(inode);
inode->i_ctime = CURRENT_TIME_SEC;
hfsplus_delete_inode(inode);
mark_inode_dirty(inode);
diff -puN fs/hpfs/namei.c~B6-monitor-clear-i_nlink fs/hpfs/namei.c
--- lxc/fs/hpfs/namei.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:54.000000000 -0700
+++ lxc-dave/fs/hpfs/namei.c 2006-08-08 09:18:57.000000000 -0700
@@ -495,7 +495,7 @@ static int hpfs_rmdir(struct inode *dir,
break;
default:
drop_nlink(dir);
- inode->i_nlink = 0;
+ clear_nlink(inode);
err = 0;
}
goto out;
@@ -590,7 +590,7 @@ static int hpfs_rename(struct inode *old
int r;
if ((r = hpfs_remove_dirent(old_dir, dno, dep, &qbh, 1)) != 2) {
if ((nde = map_dirent(new_dir, hpfs_i(new_dir)->i_dno, (char *)new_name, new_len, NULL, &qbh1))) {
- new_inode->i_nlink = 0;
+ clear_nlink(new_inode);
copy_de(nde, &de);
memcpy(nde->name, new_name, new_len);
hpfs_mark_4buffers_dirty(&qbh1);
diff -puN fs/jfs/namei.c~B6-monitor-clear-i_nlink fs/jfs/namei.c
--- lxc/fs/jfs/namei.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:54.000000000 -0700
+++ lxc-dave/fs/jfs/namei.c 2006-08-08 09:18:57.000000000 -0700
@@ -414,7 +414,7 @@ static int jfs_rmdir(struct inode *dip,
JFS_IP(ip)->acl.flag = 0;
/* mark the target directory as deleted */
- ip->i_nlink = 0;
+ clear_nlink(ip);
mark_inode_dirty(ip);
rc = txCommit(tid, 2, &iplist[0], 0);
diff -puN fs/msdos/namei.c~B6-monitor-clear-i_nlink fs/msdos/namei.c
--- lxc/fs/msdos/namei.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:54.000000000 -0700
+++ lxc-dave/fs/msdos/namei.c 2006-08-08 09:18:57.000000000 -0700
@@ -343,7 +343,7 @@ static int msdos_rmdir(struct inode *dir
goto out;
drop_nlink(dir);
- inode->i_nlink = 0;
+ clear_nlink(inode);
inode->i_ctime = CURRENT_TIME_SEC;
fat_detach(inode);
out:
@@ -425,7 +425,7 @@ static int msdos_unlink(struct inode *di
err = fat_remove_entries(dir, &sinfo); /* and releases bh */
if (err)
goto out;
- inode->i_nlink = 0;
+ clear_nlink(inode);
inode->i_ctime = CURRENT_TIME_SEC;
fat_detach(inode);
out:
diff -puN fs/nfs/dir.c~B6-monitor-clear-i_nlink fs/nfs/dir.c
--- lxc/fs/nfs/dir.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:52.000000000 -0700
+++ lxc-dave/fs/nfs/dir.c 2006-08-08 09:18:57.000000000 -0700
@@ -1280,7 +1280,7 @@ static int nfs_rmdir(struct inode *dir,
error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
/* Ensure the VFS deletes this inode */
if (error == 0 && dentry->d_inode != NULL)
- dentry->d_inode->i_nlink = 0;
+ clear_nlink(dentry->d_inode);
nfs_end_data_update(dir);
unlock_kernel();
diff -puN fs/ocfs2/namei.c~B6-monitor-clear-i_nlink fs/ocfs2/namei.c
diff -puN fs/qnx4/namei.c~B6-monitor-clear-i_nlink fs/qnx4/namei.c
--- lxc/fs/qnx4/namei.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:52.000000000 -0700
+++ lxc-dave/fs/qnx4/namei.c 2006-08-08 09:18:57.000000000 -0700
@@ -186,7 +186,7 @@ int qnx4_rmdir(struct inode *dir, struct
memset(de->di_fname, 0, sizeof de->di_fname);
de->di_mode = 0;
mark_buffer_dirty(bh);
- inode->i_nlink = 0;
+ clear_nlink(inode);
mark_inode_dirty(inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
inode_dec_link_count(dir);
diff -puN fs/reiserfs/namei.c~B6-monitor-clear-i_nlink fs/reiserfs/namei.c
--- lxc/fs/reiserfs/namei.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:54.000000000 -0700
+++ lxc-dave/fs/reiserfs/namei.c 2006-08-08 09:18:57.000000000 -0700
@@ -913,7 +913,7 @@ static int reiserfs_rmdir(struct inode *
reiserfs_warning(inode->i_sb, "%s: empty directory has nlink "
"!= 2 (%d)", __FUNCTION__, inode->i_nlink);
- inode->i_nlink = 0;
+ clear_nlink(inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
reiserfs_update_sd(&th, inode);
@@ -1473,7 +1473,7 @@ static int reiserfs_rename(struct inode
if (new_dentry_inode) {
// adjust link number of the victim
if (S_ISDIR(new_dentry_inode->i_mode)) {
- new_dentry_inode->i_nlink = 0;
+ clear_nlink(new_dentry_inode);
} else {
drop_nlink(new_dentry_inode);
}
diff -puN fs/udf/namei.c~B6-monitor-clear-i_nlink fs/udf/namei.c
--- lxc/fs/udf/namei.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:54.000000000 -0700
+++ lxc-dave/fs/udf/namei.c 2006-08-08 09:18:57.000000000 -0700
@@ -876,7 +876,7 @@ static int udf_rmdir(struct inode * dir,
udf_warning(inode->i_sb, "udf_rmdir",
"empty directory has nlink != 2 (%d)",
inode->i_nlink);
- inode->i_nlink = 0;
+ clear_nlink(inode);
inode->i_size = 0;
inode_dec_link_count(inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = current_fs_time(dir->i_sb);
diff -puN fs/vfat/namei.c~B6-monitor-clear-i_nlink fs/vfat/namei.c
--- lxc/fs/vfat/namei.c~B6-monitor-clear-i_nlink 2006-08-08 09:18:54.000000000 -0700
+++ lxc-dave/fs/vfat/namei.c 2006-08-08 09:18:57.000000000 -0700
@@ -784,7 +784,7 @@ static int vfat_rmdir(struct inode *dir,
goto out;
drop_nlink(dir);
- inode->i_nlink = 0;
+ clear_nlink(inode);
inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC;
fat_detach(inode);
out:
@@ -808,7 +808,7 @@ static int vfat_unlink(struct inode *dir
err = fat_remove_entries(dir, &sinfo); /* and releases bh */
if (err)
goto out;
- inode->i_nlink = 0;
+ clear_nlink(inode);
inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC;
fat_detach(inode);
out:
diff -puN include/linux/fs.h~B6-monitor-clear-i_nlink include/linux/fs.h
--- lxc/include/linux/fs.h~B6-monitor-clear-i_nlink 2006-08-08 09:18:54.000000000 -0700
+++ lxc-dave/include/linux/fs.h 2006-08-08 09:18:57.000000000 -0700
@@ -1272,6 +1272,11 @@ static inline void drop_nlink(struct ino
inode->i_nlink--;
}
+static inline void clear_nlink(struct inode *inode)
+{
+ inode->i_nlink = 0;
+}
+
static inline void inode_dec_link_count(struct inode *inode)
{
drop_nlink(inode);
diff -puN kernel/fork.c~B6-monitor-clear-i_nlink kernel/fork.c
_
next prev parent reply other threads:[~2006-08-09 16:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-09 16:57 [PATCH 0/6] read-only bind mount prep work Dave Hansen
2006-08-09 16:57 ` [PATCH 1/6] prepare for write access checks: collapse if() Dave Hansen
2006-08-09 17:09 ` Christoph Hellwig
2006-08-09 17:18 ` Dave Hansen
2006-08-09 16:57 ` [PATCH 2/6] r/o bind mount prepwork: move open_namei()'s vfs_create() Dave Hansen
2006-08-09 17:09 ` Christoph Hellwig
2006-08-09 16:57 ` [PATCH 3/6] unlink: monitor i_nlink Dave Hansen
2006-08-09 17:11 ` Christoph Hellwig
2006-08-09 17:17 ` Dave Hansen
2006-08-09 18:27 ` Andrew Morton
2006-08-12 14:15 ` Arnd Bergmann
2006-08-09 16:57 ` [PATCH 4/6] r/o bind mount prepwork: inc_nlink() helper Dave Hansen
2006-08-09 17:11 ` Christoph Hellwig
2006-08-09 16:57 ` [PATCH 5/6] clean up OCFS2 nlink handling Dave Hansen
2006-08-09 17:12 ` Christoph Hellwig
2006-08-09 19:15 ` Dave Hansen
2006-08-10 8:07 ` Steven Whitehouse
2006-08-10 19:06 ` Dave Hansen
2006-08-11 9:38 ` Steven Whitehouse
2006-08-09 16:57 ` Dave Hansen [this message]
2006-08-09 17:14 ` [PATCH 6/6] monitor zeroing of i_nlink Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060809165734.B81884DC@localhost.localdomain \
--to=haveblue@us.ibm.com \
--cc=akpm@osdl.org \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.