summaryrefslogtreecommitdiff
path: root/fs/configfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-09 22:26:44 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-09 22:26:44 +0400
commitc75e24752c0c87938a5955d9056dfb83e8352206 (patch)
treea96cec700059896e6b6567be324de63597b3b627 /fs/configfs
parentd2b4a646717153a1a180b64d4a8464054dbd700e (diff)
parent4fbeb19d53cc3ef2da4bd1fd89a5dc9ac04add3a (diff)
downloadlinux-c75e24752c0c87938a5955d9056dfb83e8352206.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull third set of VFS updates from Al Viro: "Misc stuff all over the place. There will be one more pile in a couple of days" This is an "evil merge" that also uses the new d_count helper in fs/configfs/dir.c, missed by commit 84d08fa888e7 ("helper for reading ->d_count") * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: ncpfs: fix error return code in ncp_parse_options() locks: move file_lock_list to a set of percpu hlist_heads and convert file_lock_lock to an lglock seq_file: add seq_list_*_percpu helpers f2fs: fix readdir incorrectness mode_t whack-a-mole... lustre: kill the pointless wrapper helper for reading ->d_count
Diffstat (limited to 'fs/configfs')
-rw-r--r--fs/configfs/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 64e5323cbbb0..5e7c60c1cb63 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -387,7 +387,7 @@ static void remove_dir(struct dentry * d)
if (d->d_inode)
simple_rmdir(parent->d_inode,d);
- pr_debug(" o %s removing done (%d)\n",d->d_name.name, d->d_count);
+ pr_debug(" o %s removing done (%d)\n",d->d_name.name, d_count(d));
dput(parent);
}