diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 11:27:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 11:27:09 -0700 |
| commit | 871fa90791a6f83dd8e2e489feb9534a8c02088d (patch) | |
| tree | 9dafdf0f32fb61dd25d845da79d57d40eded4458 | |
| parent | 7702667bb490573c807fa45519378e84b5050d1d (diff) | |
| parent | 79f52b77b89e8b7aa9fbe62135eea198a2ecbd5b (diff) | |
| download | linux-871fa90791a6f83dd8e2e489feb9534a8c02088d.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
jfs: Add missing mutex_unlock call to error path
missing unlock in jfs_quota_write()
| -rw-r--r-- | fs/jfs/jfs_imap.c | 1 | ||||
| -rw-r--r-- | fs/jfs/super.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c index 346057218edc..0fc30407f039 100644 --- a/fs/jfs/jfs_imap.c +++ b/fs/jfs/jfs_imap.c @@ -2571,6 +2571,7 @@ diNewIAG(struct inomap * imap, int *iagnop, int agno, struct metapage ** mpp) txAbort(tid, 0); txEnd(tid); + mutex_unlock(&JFS_IP(ipimap)->commit_mutex); /* release the inode map lock */ IWRITE_UNLOCK(ipimap); diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 6f21adf9479a..d9b0e92b3602 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -720,8 +720,10 @@ static ssize_t jfs_quota_write(struct super_block *sb, int type, blk++; } out: - if (len == towrite) + if (len == towrite) { + mutex_unlock(&inode->i_mutex); return err; + } if (inode->i_size < off+len-towrite) i_size_write(inode, off+len-towrite); inode->i_version++; |