diff options
author | Dave Hansen <haveblue@us.ibm.com> | 2006-10-01 02:29:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:30 -0400 |
commit | 9a53c3a783c2fa9b969628e65695c11c3e51e673 (patch) | |
tree | 5a6115e18ee105246d46e3db3d5b07749d232f5b /fs/jffs/inode-v23.c | |
parent | aab520e2f6c80160cabd187a8d0292d1cec8ff68 (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/jffs/inode-v23.c')
-rw-r--r-- | fs/jffs/inode-v23.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c index 068ef0de8de2..3f7899ea4cba 100644 --- a/fs/jffs/inode-v23.c +++ b/fs/jffs/inode-v23.c | |||
@@ -1052,9 +1052,8 @@ jffs_remove(struct inode *dir, struct dentry *dentry, int type) | |||
1052 | 1052 | ||
1053 | dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; | 1053 | dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; |
1054 | mark_inode_dirty(dir); | 1054 | mark_inode_dirty(dir); |
1055 | inode->i_nlink--; | ||
1056 | inode->i_ctime = dir->i_ctime; | 1055 | inode->i_ctime = dir->i_ctime; |
1057 | mark_inode_dirty(inode); | 1056 | inode_dec_link_count(inode); |
1058 | 1057 | ||
1059 | d_delete(dentry); /* This also frees the inode */ | 1058 | d_delete(dentry); /* This also frees the inode */ |
1060 | 1059 | ||