From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: v9fs-developer@lists.sourceforge.net
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [PATCH 04/14] fs/9p: Drop the directory link count correctly
Date: Thu, 17 Feb 2011 23:31:55 +0530 [thread overview]
Message-ID: <1297965725-25603-5-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1297965725-25603-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
On unlink we should clear the director link count
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
fs/9p/vfs_inode.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index b36711b..ae4fd90 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -509,8 +509,17 @@ static int v9fs_remove(struct inode *dir, struct dentry *file, int rmdir)
return PTR_ERR(v9fid);
retval = p9_client_remove(v9fid);
- if (!retval)
- drop_nlink(file_inode);
+ if (!retval) {
+ /*
+ * directories on unlink should have zero
+ * link count
+ */
+ if (rmdir) {
+ clear_nlink(file_inode);
+ drop_nlink(dir);
+ } else
+ drop_nlink(file_inode);
+ }
return retval;
}
--
1.7.1
next prev parent reply other threads:[~2011-02-17 18:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-17 18:01 [PATCH -V3] Buffered write and writeable mmap support for 9P Aneesh Kumar K.V
2011-02-17 18:01 ` [PATCH 01/14] fs/9p: Fix inode i_size update in file_write Aneesh Kumar K.V
2011-02-17 18:01 ` [PATCH 02/14] fs/9p: Add direct IO support in cached mode Aneesh Kumar K.V
2011-02-17 18:01 ` [PATCH 03/14] fs/9p: Add drop_inode 9p callback Aneesh Kumar K.V
2011-02-17 18:01 ` Aneesh Kumar K.V [this message]
2011-02-17 18:01 ` [PATCH 05/14] fs/9p: Update link count correctly during rename Aneesh Kumar K.V
2011-02-17 18:01 ` [PATCH 06/14] fs/9p: Update link count correctly on mkdir Aneesh Kumar K.V
2011-02-17 18:01 ` [PATCH 07/14] fs/9p: Initialize root inode number for dotl Aneesh Kumar K.V
2011-02-17 18:01 ` [PATCH 08/14] fs/9p: Add support for marking inode attribute invalid Aneesh Kumar K.V
2011-02-17 18:02 ` [PATCH 09/14] fs/9p: Mark inode attr invalid on setattr Aneesh Kumar K.V
2011-02-17 18:02 ` [PATCH 10/14] fs/9p: Add . and .. dentry revalidation flag Aneesh Kumar K.V
2011-02-17 18:02 ` [PATCH 11/14] fs/9p: Mark directory inode invalid for many directory inode operations Aneesh Kumar K.V
2011-02-17 18:02 ` [PATCH 12/14] fs/9p: mark inode attribute invalid on rename and unlink Aneesh Kumar K.V
2011-02-17 18:02 ` [PATCH 13/14] fs/9p: Workaround vfs rename rehash bug Aneesh Kumar K.V
2011-02-17 18:02 ` [PATCH 14/14] fs/9p: Prevent multiple inclusion of same header Aneesh Kumar K.V
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=1297965725-25603-5-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
--to=aneesh.kumar@linux.vnet.ibm.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=v9fs-developer@lists.sourceforge.net \
/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).