aboutsummaryrefslogtreecommitdiffstats
path: root/fs/qnx4
diff options
context:
space:
mode:
authorDave Hansen <haveblue@us.ibm.com>2006-10-01 02:29:03 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 03:39:30 -0400
commit9a53c3a783c2fa9b969628e65695c11c3e51e673 (patch)
tree5a6115e18ee105246d46e3db3d5b07749d232f5b /fs/qnx4
parentaab520e2f6c80160cabd187a8d0292d1cec8ff68 (diff)
[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.c6
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)
189 inode->i_nlink = 0; 189 inode->i_nlink = 0;
190 mark_inode_dirty(inode); 190 mark_inode_dirty(inode);
191 inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; 191 inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
192 dir->i_nlink--; 192 inode_dec_link_count(dir);
193 mark_inode_dirty(dir);
194 retval = 0; 193 retval = 0;
195 194
196 end_rmdir: 195 end_rmdir:
@@ -234,9 +233,8 @@ int qnx4_unlink(struct inode *dir, struct dentry *dentry)
234 mark_buffer_dirty(bh); 233 mark_buffer_dirty(bh);
235 dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; 234 dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
236 mark_inode_dirty(dir); 235 mark_inode_dirty(dir);
237 inode->i_nlink--;
238 inode->i_ctime = dir->i_ctime; 236 inode->i_ctime = dir->i_ctime;
239 mark_inode_dirty(inode); 237 inode_dec_link_count(inode);
240 retval = 0; 238 retval = 0;
241 239
242end_unlink: 240end_unlink: