Commit dccdee46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e25c2c87 a069e9ce

fs/ext2/super.c

+3 −1
Original line number Diff line number Diff line
@@ -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++;

fs/quota/Makefile

+0 −9
Original line number Diff line number Diff line 
#

# 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