From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932237AbWFLVIf (ORCPT ); Mon, 12 Jun 2006 17:08:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932258AbWFLVIf (ORCPT ); Mon, 12 Jun 2006 17:08:35 -0400 Received: from gold.veritas.com ([143.127.12.110]:58388 "EHLO gold.veritas.com") by vger.kernel.org with ESMTP id S932237AbWFLVIe (ORCPT ); Mon, 12 Jun 2006 17:08:34 -0400 X-IronPort-AV: i="4.05,229,1146466800"; d="scan'208"; a="60529041:sNHT29364308" Date: Mon, 12 Jun 2006 21:53:23 +0100 (BST) From: Hugh Dickins X-X-Sender: hugh@blonde.wat.veritas.com To: Linus Torvalds cc: Sergey Vlasov , Al Viro , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH] tmpfs: Decrement i_nlink correctly in shmem_rmdir() In-Reply-To: Message-ID: References: <11501251772137-git-send-email-vsu@altlinux.ru> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-OriginalArrivalTime: 12 Jun 2006 21:08:33.0816 (UTC) FILETIME=[5D336180:01C68E64] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Sergey Vlasov shmem_rmdir() must undo the increment of i_nlink done in shmem_get_inode() for directories, otherwise at least IN_DELETE_SELF inotify event generation is broken. Signed-off-by: Sergey Vlasov Signed-off-by: Hugh Dickins --- This can also be included in 2.6.17, though only inotify depends on it. mm/shmem.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) --- 2.6.17-rc6-git/mm/shmem.c +++ linux/mm/shmem.c @@ -1780,6 +1780,7 @@ static int shmem_rmdir(struct inode *dir if (!simple_empty(dentry)) return -ENOTEMPTY; + dentry->d_inode->i_nlink--; dir->i_nlink--; return shmem_unlink(dir, dentry); }