diff options
| author |   Fabian Frederick <fabf@skynet.be> | 2014-06-06 14:38:34 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 16:08:18 -0700 |
| commit | 0244756edc4b98c129e92c7061d9f383708cf786 (patch) | |
| tree | 49ff65c45d2ca48e184e1d931d79c122982461e1 /fs/ufs/ufs.h | |
| parent | powerpc: update comments for generic idle conversion (diff) | |
| download | linux-dev-0244756edc4b98c129e92c7061d9f383708cf786.tar.xz linux-dev-0244756edc4b98c129e92c7061d9f383708cf786.zip | |
ufs: sb mutex merge + mutex_destroy
Commit 788257d6101d ("ufs: remove the BKL") replaced BKL with mutex
protection using functions lock_ufs, unlock_ufs and struct mutex 'mutex'
in sb_info.
Commit b6963327e052 ("ufs: drop lock/unlock super") removed lock/unlock
super and added struct mutex 's_lock' in sb_info.
Those 2 mutexes are generally locked/unlocked at the same time except in
allocation (balloc, ialloc).
This patch merges the 2 mutexes and propagates first commit solution.
It also adds mutex destruction before kfree during ufs_fill_super
failure and ufs_put_super.
[akpm@linux-foundation.org: avoid ifdefs, return -EROFS not -EINVAL]
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Evgeniy Dushistov <dushistov@mail.ru>
Cc: "Chen, Jet" <jet.chen@intel.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ufs/ufs.h')
| -rw-r--r-- | fs/ufs/ufs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h index ff2c15ab81aa..343e6fc571e5 100644 --- a/fs/ufs/ufs.h +++ b/fs/ufs/ufs.h @@ -24,7 +24,6 @@ struct ufs_sb_info { int work_queued; /* non-zero if the delayed work is queued */ struct delayed_work sync_work; /* FS sync delayed work */ spinlock_t work_lock; /* protects sync_work and work_queued */ - struct mutex s_lock; }; struct ufs_inode_info { |