From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicholas Krause Subject: [PATCH] f2fs:Fix concurrent access issue in the function recover_dentry Date: Wed, 16 Sep 2015 19:10:04 -0400 Message-ID: <1442445004-25986-1-git-send-email-xerofoify@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ZcLqA-0004PX-MF for linux-f2fs-devel@lists.sourceforge.net; Wed, 16 Sep 2015 23:10:14 +0000 Received: from mail-ig0-f181.google.com ([209.85.213.181]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1ZcLqA-0004jd-0K for linux-f2fs-devel@lists.sourceforge.net; Wed, 16 Sep 2015 23:10:14 +0000 Received: by igcpb10 with SMTP id pb10so685334igc.1 for ; Wed, 16 Sep 2015 16:10:08 -0700 (PDT) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: jaegeuk@kernel.org Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net This fixes a concurrent access in the function recover_dentry by locking the superblock representation in memory with f2fs_lock_op before calling the function __f2fs_add_link and unlocking the superblock afterwards with f2fs_unlock_op in order to avoid concurrent access here as neither recover_dentry nor its callers Signed-off-by: Nicholas Krause --- fs/f2fs/recovery.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index faec2ca..6bb03f8 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c @@ -70,6 +70,7 @@ static struct fsync_inode_entry *get_fsync_inode(struct list_head *head, static int recover_dentry(struct inode *inode, struct page *ipage) { struct f2fs_inode *raw_inode = F2FS_INODE(ipage); + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); nid_t pino = le32_to_cpu(raw_inode->i_pino); struct f2fs_dir_entry *de; struct qstr name; @@ -119,9 +120,15 @@ retry: iput(einode); goto retry; } + + + f2fs_lock_op(sbi); err = __f2fs_add_link(dir, &name, inode, inode->i_ino, inode->i_mode); - if (err) + if (err) { + f2fs_unlock_op(sbi); goto out_err; + } + f2fs_unlock_op(sbi); if (is_inode_flag_set(F2FS_I(dir), FI_DELAY_IPUT)) { iput(dir); -- 2.1.4 ------------------------------------------------------------------------------ Monitor Your Dynamic Infrastructure at Any Scale With Datadog! Get real-time metrics from all of your servers, apps and tools in one place. SourceForge users - Click here to start your Free Trial of Datadog now! http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140