diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-27 08:40:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-27 08:40:00 -0700 |
| commit | dccdee460e68a0e1a94f497c17c10b8059e67633 (patch) | |
| tree | bbc6bbf64b66892a0f462b4e60091f54b6532ac9 /fs | |
| parent | e25c2c873f59c57cf1c2b1979cc8fb01958305ef (diff) | |
| parent | a069e9cee1dba2f847839d325f46ce6976ed1b76 (diff) | |
| download | op-kernel-dev-dccdee460e68a0e1a94f497c17c10b8059e67633.zip op-kernel-dev-dccdee460e68a0e1a94f497c17c10b8059e67633.tar.gz | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6:
ext2: missing unlock in ext2_quota_write()
quota: remove obsolete comments in fs/quota/Makefile
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext2/super.c | 4 | ||||
| -rw-r--r-- | fs/quota/Makefile | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index f983225..5c4afe6 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -1395,8 +1395,10 @@ static ssize_t ext2_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++; diff --git a/fs/quota/Makefile b/fs/quota/Makefile index 385a083..68d4f6d 100644 --- a/fs/quota/Makefile +++ b/fs/quota/Makefile @@ -1,12 +1,3 @@ -# -# Makefile for the Linux filesystems. -# -# 14 Sep 2000, Christoph Hellwig <hch@infradead.org> -# Rewritten to use lists instead of if-statements. -# - -obj-y := - obj-$(CONFIG_QUOTA) += dquot.o obj-$(CONFIG_QFMT_V1) += quota_v1.o obj-$(CONFIG_QFMT_V2) += quota_v2.o |
