diff options
| author | Dave Hansen <haveblue@us.ibm.com> | 2006-09-30 23:29:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 00:39:30 -0700 |
| commit | 9a53c3a783c2fa9b969628e65695c11c3e51e673 (patch) | |
| tree | 5a6115e18ee105246d46e3db3d5b07749d232f5b /fs/qnx4 | |
| parent | aab520e2f6c80160cabd187a8d0292d1cec8ff68 (diff) | |
| download | blackbird-op-linux-9a53c3a783c2fa9b969628e65695c11c3e51e673.tar.gz blackbird-op-linux-9a53c3a783c2fa9b969628e65695c11c3e51e673.zip | |
[PATCH] r/o bind mounts: unlink: monitor i_nlink
When a filesystem decrements i_nlink to zero, it means that a write must be
performed in order to drop the inode from the filesystem.
We're shortly going to have keep filesystems from being remounted r/o between
the time that this i_nlink decrement and that write occurs.
So, add a little helper function to do the decrements. We'll tie into it in a
bit to note when i_nlink hits zero.
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/qnx4')
| -rw-r--r-- | fs/qnx4/namei.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/qnx4/namei.c b/fs/qnx4/namei.c index c3d83f67154a..ad5afa4ea8f3 100644 --- a/fs/qnx4/namei.c +++ b/fs/qnx4/namei.c @@ -189,8 +189,7 @@ int qnx4_rmdir(struct inode *dir, struct dentry *dentry) inode->i_nlink = 0; mark_inode_dirty(inode); inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; - dir->i_nlink--; - mark_inode_dirty(dir); + inode_dec_link_count(dir); retval = 0; end_rmdir: @@ -234,9 +233,8 @@ int qnx4_unlink(struct inode *dir, struct dentry *dentry) mark_buffer_dirty(bh); dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; mark_inode_dirty(dir); - inode->i_nlink--; inode->i_ctime = dir->i_ctime; - mark_inode_dirty(inode); + inode_dec_link_count(inode); retval = 0; end_unlink: |
