diff options
author | Joern Engel <joern@wohnheim.fh-wedel.de> | 2007-10-17 02:30:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:43:02 -0400 |
commit | 1c0eeaf5698597146ed9b873e2f9e0961edcf0f9 (patch) | |
tree | 5265eac8437e8ce517a62db8fe2bd99db5b7019b /fs/xfs | |
parent | 2e6883bdf49abd0e7f0d9b6297fc3be7ebb2250b (diff) |
introduce I_SYNC
I_LOCK was used for several unrelated purposes, which caused deadlock
situations in certain filesystems as a side effect. One of the purposes
now uses the new I_SYNC bit.
Also document the various bits and change their order from historical to
logical.
[bunk@stusta.de: make fs/inode.c:wake_up_inode() static]
Signed-off-by: Joern Engel <joern@wohnheim.fh-wedel.de>
Cc: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Cc: David Chinner <dgc@sgi.com>
Cc: Anton Altaparmakov <aia21@cam.ac.uk>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index 0b5fa124bef2..e0e06dd4bef2 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c | |||
@@ -133,7 +133,7 @@ xfs_ichgtime( | |||
133 | */ | 133 | */ |
134 | SYNCHRONIZE(); | 134 | SYNCHRONIZE(); |
135 | ip->i_update_core = 1; | 135 | ip->i_update_core = 1; |
136 | if (!(inode->i_state & I_LOCK)) | 136 | if (!(inode->i_state & I_SYNC)) |
137 | mark_inode_dirty_sync(inode); | 137 | mark_inode_dirty_sync(inode); |
138 | } | 138 | } |
139 | 139 | ||
@@ -185,7 +185,7 @@ xfs_ichgtime_fast( | |||
185 | */ | 185 | */ |
186 | SYNCHRONIZE(); | 186 | SYNCHRONIZE(); |
187 | ip->i_update_core = 1; | 187 | ip->i_update_core = 1; |
188 | if (!(inode->i_state & I_LOCK)) | 188 | if (!(inode->i_state & I_SYNC)) |
189 | mark_inode_dirty_sync(inode); | 189 | mark_inode_dirty_sync(inode); |
190 | } | 190 | } |
191 | 191 | ||