diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-24 11:05:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-24 11:05:42 +1000 |
| commit | 06b86c6cd3966f903ca789d7173e43d024868cf1 (patch) | |
| tree | aa88a3bc2420f42cf4fd3272911daf4dd618842c /fs | |
| parent | ada071e21fa956c255ba4160e95b575b3cc96006 (diff) | |
| parent | 4c1cf65df6357fa4ee8be486c947b25f46a030a6 (diff) | |
Merge commit 'quota/for_next'
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 f983225266dc..5c4afe652245 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 385a0831cc99..68d4f6dc0578 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 |