diff options
author | Dave Hansen <haveblue@us.ibm.com> | 2006-10-01 02:29:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:30 -0400 |
commit | ce71ec36840368b877fb63bd14c8e67ab62d08b1 (patch) | |
tree | 55ea3caaa339881dfd66d787b3dbbb964825d07a /fs/hpfs | |
parent | 17ff785691503f63ec648df82a7fdaece7695561 (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/hpfs')
-rw-r--r-- | fs/hpfs/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c index 25dd6f81eca7..2507e7393f3c 100644 --- a/fs/hpfs/namei.c +++ b/fs/hpfs/namei.c | |||
@@ -495,7 +495,7 @@ static int hpfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
495 | break; | 495 | break; |
496 | default: | 496 | default: |
497 | drop_nlink(dir); | 497 | drop_nlink(dir); |
498 | inode->i_nlink = 0; | 498 | clear_nlink(inode); |
499 | err = 0; | 499 | err = 0; |
500 | } | 500 | } |
501 | goto out; | 501 | goto out; |
@@ -590,7 +590,7 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
590 | int r; | 590 | int r; |
591 | if ((r = hpfs_remove_dirent(old_dir, dno, dep, &qbh, 1)) != 2) { | 591 | if ((r = hpfs_remove_dirent(old_dir, dno, dep, &qbh, 1)) != 2) { |
592 | if ((nde = map_dirent(new_dir, hpfs_i(new_dir)->i_dno, (char *)new_name, new_len, NULL, &qbh1))) { | 592 | if ((nde = map_dirent(new_dir, hpfs_i(new_dir)->i_dno, (char *)new_name, new_len, NULL, &qbh1))) { |
593 | new_inode->i_nlink = 0; | 593 | clear_nlink(new_inode); |
594 | copy_de(nde, &de); | 594 | copy_de(nde, &de); |
595 | memcpy(nde->name, new_name, new_len); | 595 | memcpy(nde->name, new_name, new_len); |
596 | hpfs_mark_4buffers_dirty(&qbh1); | 596 | hpfs_mark_4buffers_dirty(&qbh1); |