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/hfsplus/dir.c | |
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/hfsplus/dir.c')
-rw-r--r-- | fs/hfsplus/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index 99b4ed1b87d2..7e309751645f 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c | |||
@@ -348,7 +348,7 @@ static int hfsplus_unlink(struct inode *dir, struct dentry *dentry) | |||
348 | } else | 348 | } else |
349 | inode->i_flags |= S_DEAD; | 349 | inode->i_flags |= S_DEAD; |
350 | } else | 350 | } else |
351 | inode->i_nlink = 0; | 351 | clear_nlink(inode); |
352 | inode->i_ctime = CURRENT_TIME_SEC; | 352 | inode->i_ctime = CURRENT_TIME_SEC; |
353 | mark_inode_dirty(inode); | 353 | mark_inode_dirty(inode); |
354 | 354 | ||
@@ -387,7 +387,7 @@ static int hfsplus_rmdir(struct inode *dir, struct dentry *dentry) | |||
387 | res = hfsplus_delete_cat(inode->i_ino, dir, &dentry->d_name); | 387 | res = hfsplus_delete_cat(inode->i_ino, dir, &dentry->d_name); |
388 | if (res) | 388 | if (res) |
389 | return res; | 389 | return res; |
390 | inode->i_nlink = 0; | 390 | clear_nlink(inode); |
391 | inode->i_ctime = CURRENT_TIME_SEC; | 391 | inode->i_ctime = CURRENT_TIME_SEC; |
392 | hfsplus_delete_inode(inode); | 392 | hfsplus_delete_inode(inode); |
393 | mark_inode_dirty(inode); | 393 | mark_inode_dirty(inode); |