The patch titled
r/o bind mounts: monitor zeroing of i_nlink
has been removed from the -mm tree. Its filename is
r-o-bind-mount-monitor-zeroing-of-i_nlink.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: r/o bind mounts: monitor zeroing of i_nlink
From: Dave Hansen <haveblue@xxxxxxxxxx>
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@xxxxxxxxxx>
Acked-by: Christoph Hellwig <hch@xxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/autofs4/root.c | 4 ++--
fs/cifs/inode.c | 2 +-
fs/ext3/namei.c | 2 +-
fs/fuse/dir.c | 4 ++--
fs/hfs/dir.c | 2 +-
fs/hfsplus/dir.c | 4 ++--
fs/hpfs/namei.c | 4 ++--
fs/jfs/namei.c | 2 +-
fs/msdos/namei.c | 4 ++--
fs/nfs/dir.c | 2 +-
fs/qnx4/namei.c | 2 +-
fs/reiserfs/namei.c | 4 ++--
fs/udf/namei.c | 2 +-
fs/vfat/namei.c | 4 ++--
include/linux/fs.h | 5 +++++
15 files changed, 26 insertions(+), 21 deletions(-)
diff -puN fs/autofs4/root.c~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/autofs4/root.c
--- a/fs/autofs4/root.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/autofs4/root.c
@@ -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/cifs/inode.c~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/cifs/inode.c
--- a/fs/cifs/inode.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/cifs/inode.c
@@ -818,7 +818,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~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/ext3/namei.c
--- a/fs/ext3/namei.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/ext3/namei.c
@@ -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/fuse/dir.c~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/fuse/dir.c
--- a/fs/fuse/dir.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/fuse/dir.c
@@ -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~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/hfs/dir.c
--- a/fs/hfs/dir.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/hfs/dir.c
@@ -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~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/hfsplus/dir.c
--- a/fs/hfsplus/dir.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/hfsplus/dir.c
@@ -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~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/hpfs/namei.c
--- a/fs/hpfs/namei.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/hpfs/namei.c
@@ -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~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/jfs/namei.c
--- a/fs/jfs/namei.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/jfs/namei.c
@@ -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~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/msdos/namei.c
--- a/fs/msdos/namei.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/msdos/namei.c
@@ -345,7 +345,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:
@@ -430,7 +430,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~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/nfs/dir.c
--- a/fs/nfs/dir.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/nfs/dir.c
@@ -1286,7 +1286,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/qnx4/namei.c~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/qnx4/namei.c
--- a/fs/qnx4/namei.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/qnx4/namei.c
@@ -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~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/reiserfs/namei.c
--- a/fs/reiserfs/namei.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/reiserfs/namei.c
@@ -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~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/udf/namei.c
--- a/fs/udf/namei.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/udf/namei.c
@@ -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~r-o-bind-mount-monitor-zeroing-of-i_nlink fs/vfat/namei.c
--- a/fs/vfat/namei.c~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/fs/vfat/namei.c
@@ -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~r-o-bind-mount-monitor-zeroing-of-i_nlink include/linux/fs.h
--- a/include/linux/fs.h~r-o-bind-mount-monitor-zeroing-of-i_nlink
+++ a/include/linux/fs.h
@@ -1235,6 +1235,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);
_
Patches currently in -mm which might be from haveblue@xxxxxxxxxx are
origin.patch
get-rid-of-zone_table.patch
get-rid-of-zone_table-fix.patch
fs-cache-make-kafs-use-fs-cache-fix.patch
pids-coding-style-use-struct-pidmap.patch
move-pidmap-to-pspaceh.patch
move-pidmap-to-pspaceh-fix.patch
define-struct-pspace.patch
page-owner-tracking-leak-detector.patch
x86-e820-debugging.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
