diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2013-08-08 17:34:46 -0400 |
|---|---|---|
| committer | Jeff Mahoney <jeffm@suse.de> | 2013-08-08 17:34:46 -0400 |
| commit | 278f6679f454bf185a07d9a4ca355b153482d17a (patch) | |
| tree | ffead073e67cfdc1ddfc3949ebc93c06dcaaab8f /fs/reiserfs/super.c | |
| parent | 4c05141df57f4ffc1a9a28f1925434924179bfe4 (diff) | |
| download | linux-278f6679f454bf185a07d9a4ca355b153482d17a.tar.gz linux-278f6679f454bf185a07d9a4ca355b153482d17a.tar.bz2 linux-278f6679f454bf185a07d9a4ca355b153482d17a.zip | |
reiserfs: locking, handle nested locks properly
The reiserfs write lock replaced the BKL and uses similar semantics.
Frederic's locking code makes a distinction between when the lock is nested
and when it's being acquired/released, but I don't think that's the right
distinction to make.
The right distinction is between the lock being released at end-of-use and
the lock being released for a schedule. The unlock should return the depth
and the lock should restore it, rather than the other way around as it is now.
This patch implements that and adds a number of places where the lock
should be dropped.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Diffstat (limited to 'fs/reiserfs/super.c')
| -rw-r--r-- | fs/reiserfs/super.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 7e81d9774916..60d09327e587 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -624,7 +624,6 @@ static void reiserfs_dirty_inode(struct inode *inode, int flags) struct reiserfs_transaction_handle th; int err = 0; - int lock_depth; if (inode->i_sb->s_flags & MS_RDONLY) { reiserfs_warning(inode->i_sb, "clm-6006", @@ -632,7 +631,7 @@ static void reiserfs_dirty_inode(struct inode *inode, int flags) inode->i_ino); return; } - lock_depth = reiserfs_write_lock_once(inode->i_sb); + reiserfs_write_lock(inode->i_sb); /* this is really only used for atime updates, so they don't have ** to be included in O_SYNC or fsync @@ -645,7 +644,7 @@ static void reiserfs_dirty_inode(struct inode *inode, int flags) journal_end(&th, inode->i_sb, 1); out: - reiserfs_write_unlock_once(inode->i_sb, lock_depth); + reiserfs_write_unlock(inode->i_sb); } static int reiserfs_show_options(struct seq_file *seq, struct dentry *root) |