diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /fs/ext3/super.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/ext3/super.c')
| -rw-r--r-- | fs/ext3/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index f2dd71336612..813d589cc6c0 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
| @@ -2614,7 +2614,7 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type, | |||
| 2614 | struct buffer_head *bh; | 2614 | struct buffer_head *bh; |
| 2615 | handle_t *handle = journal_current_handle(); | 2615 | handle_t *handle = journal_current_handle(); |
| 2616 | 2616 | ||
| 2617 | mutex_lock(&inode->i_mutex); | 2617 | mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); |
| 2618 | while (towrite > 0) { | 2618 | while (towrite > 0) { |
| 2619 | tocopy = sb->s_blocksize - offset < towrite ? | 2619 | tocopy = sb->s_blocksize - offset < towrite ? |
| 2620 | sb->s_blocksize - offset : towrite; | 2620 | sb->s_blocksize - offset : towrite; |