reiserfs-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: reiserfs-devel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org,
	Frederic Weisbecker <fweisbec@gmail.com>, Jan Kara <jack@suse.cz>
Subject: [PATCH] reiserfs: Fix locking in reiserfs_quota_on()
Date: Thu, 28 Oct 2010 02:28:23 +0200	[thread overview]
Message-ID: <1288225703-8170-1-git-send-email-jack@suse.cz> (raw)

reiserfs_quota_on() unpacks a tail of quota file in case it has one. But after
BKL conversion, reiserfs_unpack() expects to be called with write_lock held.
So acquire the lock before calling reiserfs_unpack() to avoid assertion
failures.

Reported-by: markus.gapp@gmx.net
Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/reiserfs/super.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

 Frederic, would you merge this patch or should I merge it?

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 6e85cfd..73c000f 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -2059,7 +2059,9 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
 	inode = path->dentry->d_inode;
 	/* We must not pack tails for quota files on reiserfs for quota IO to work */
 	if (!(REISERFS_I(inode)->i_flags & i_nopack_mask)) {
+		reiserfs_write_lock(sb);
 		err = reiserfs_unpack(inode, NULL);
+		reiserfs_write_unlock(sb);
 		if (err) {
 			reiserfs_warning(sb, "super-6520",
 				"Unpacking tail of quota file failed"
-- 
1.7.1


             reply	other threads:[~2010-10-28  0:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-28  0:28 Jan Kara [this message]
2010-10-28  0:47 ` [PATCH] reiserfs: Fix locking in reiserfs_quota_on() Al Viro
2010-10-28  1:36 ` Frederic Weisbecker
2010-11-09 15:37   ` Jan Kara
2010-11-09 15:40     ` Frederic Weisbecker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1288225703-8170-1-git-send-email-jack@suse.cz \
    --to=jack@suse.cz \
    --cc=fweisbec@gmail.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=reiserfs-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).