aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
diff options
context:
space:
mode:
authorDave Hansen <haveblue@us.ibm.com>2006-10-01 02:29:06 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 03:39:30 -0400
commitce71ec36840368b877fb63bd14c8e67ab62d08b1 (patch)
tree55ea3caaa339881dfd66d787b3dbbb964825d07a /fs/reiserfs
parent17ff785691503f63ec648df82a7fdaece7695561 (diff)
[PATCH] r/o bind mounts: monitor zeroing of i_nlink
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> Acked-by: Christoph Hellwig <hch@lst.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r--fs/reiserfs/namei.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index cf92e89515f..16e9cff8f15 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -913,7 +913,7 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
913 reiserfs_warning(inode->i_sb, "%s: empty directory has nlink " 913 reiserfs_warning(inode->i_sb, "%s: empty directory has nlink "
914 "!= 2 (%d)", __FUNCTION__, inode->i_nlink); 914 "!= 2 (%d)", __FUNCTION__, inode->i_nlink);
915 915
916 inode->i_nlink = 0; 916 clear_nlink(inode);
917 inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; 917 inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
918 reiserfs_update_sd(&th, inode); 918 reiserfs_update_sd(&th, inode);
919 919
@@ -1473,7 +1473,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1473 if (new_dentry_inode) { 1473 if (new_dentry_inode) {
1474 // adjust link number of the victim 1474 // adjust link number of the victim
1475 if (S_ISDIR(new_dentry_inode->i_mode)) { 1475 if (S_ISDIR(new_dentry_inode->i_mode)) {
1476 new_dentry_inode->i_nlink = 0; 1476 clear_nlink(new_dentry_inode);
1477 } else { 1477 } else {
1478 drop_nlink(new_dentry_inode); 1478 drop_nlink(new_dentry_inode);
1479 } 1479 }