* [patch 1/3] vfs: dcache sparse fixes
2008-06-23 16:11 [patch 0/3] vfs: d_path cleanups and fixes Miklos Szeredi
@ 2008-06-23 16:11 ` Miklos Szeredi
2008-06-23 16:11 ` [patch 2/3] vfs: dcache cleanups Miklos Szeredi
2008-06-23 16:11 ` [patch 3/3] vfs: fix sys_getcwd for detached mounts Miklos Szeredi
2 siblings, 0 replies; 6+ messages in thread
From: Miklos Szeredi @ 2008-06-23 16:11 UTC (permalink / raw)
To: viro; +Cc: linux-kernel, linux-fsdevel, hch
[-- Attachment #1: vfs-dcache-sparse-fixes.patch --]
[-- Type: text/plain, Size: 4240 bytes --]
From: Miklos Szeredi <mszeredi@suse.cz>
Fix the following sparse warnings:
fs/dcache.c:2183:19: warning: symbol 'filp_cachep' was not declared. Should it be static?
fs/dcache.c:115:3: warning: context imbalance in 'dentry_iput' - unexpected unlock
fs/dcache.c:188:2: warning: context imbalance in 'dput' - different lock contexts for basic block
fs/dcache.c:400:2: warning: context imbalance in 'prune_one_dentry' - different lock contexts for basic block
fs/dcache.c:431:22: warning: context imbalance in 'prune_dcache' - different lock contexts for basic block
fs/dcache.c:563:2: warning: context imbalance in 'shrink_dcache_sb' - different lock contexts for basic block
fs/dcache.c:1385:6: warning: context imbalance in 'd_delete' - wrong count at exit
fs/dcache.c:1636:2: warning: context imbalance in '__d_unalias' - unexpected unlock
fs/dcache.c:1735:2: warning: context imbalance in 'd_materialise_unique' - different lock contexts for basic block
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Reviewed-by: Matthew Wilcox <willy@linux.intel.com>
Acked-by: Christoph Hellwig <hch@infradead.org>
---
fs/dcache.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
Index: linux-2.6/fs/dcache.c
===================================================================
--- linux-2.6.orig/fs/dcache.c 2008-06-23 17:25:19.000000000 +0200
+++ linux-2.6/fs/dcache.c 2008-06-23 17:27:11.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/syscalls.h>
#include <linux/string.h>
#include <linux/mm.h>
+#include <linux/fdtable.h>
#include <linux/fs.h>
#include <linux/fsnotify.h>
#include <linux/slab.h>
@@ -106,9 +107,10 @@ static void dentry_lru_remove(struct den
/*
* Release the dentry's inode, using the filesystem
* d_iput() operation if defined.
- * Called with dcache_lock and per dentry lock held, drops both.
*/
static void dentry_iput(struct dentry * dentry)
+ __releases(dentry->d_lock)
+ __releases(dcache_lock)
{
struct inode *inode = dentry->d_inode;
if (inode) {
@@ -132,12 +134,13 @@ static void dentry_iput(struct dentry *
* d_kill - kill dentry and return parent
* @dentry: dentry to kill
*
- * Called with dcache_lock and d_lock, releases both. The dentry must
- * already be unhashed and removed from the LRU.
+ * The dentry must already be unhashed and removed from the LRU.
*
* If this is the root of the dentry tree, return NULL.
*/
static struct dentry *d_kill(struct dentry *dentry)
+ __releases(dentry->d_lock)
+ __releases(dcache_lock)
{
struct dentry *parent;
@@ -383,11 +386,11 @@ restart:
* Try to prune ancestors as well. This is necessary to prevent
* quadratic behavior of shrink_dcache_parent(), but is also expected
* to be beneficial in reducing dentry cache fragmentation.
- *
- * Called with dcache_lock, drops it and then regains.
- * Called with dentry->d_lock held, drops it.
*/
static void prune_one_dentry(struct dentry * dentry)
+ __releases(dentry->d_lock)
+ __releases(dcache_lock)
+ __acquires(dcache_lock)
{
__d_drop(dentry);
dentry = d_kill(dentry);
@@ -1604,10 +1607,9 @@ static int d_isparent(struct dentry *p1,
*
* Note: If ever the locking in lock_rename() changes, then please
* remember to update this too...
- *
- * On return, dcache_lock will have been unlocked.
*/
static struct dentry *__d_unalias(struct dentry *dentry, struct dentry *alias)
+ __releases(dcache_lock)
{
struct mutex *m1 = NULL, *m2 = NULL;
struct dentry *ret;
@@ -1743,7 +1745,6 @@ out_nolock:
shouldnt_be_hashed:
spin_unlock(&dcache_lock);
BUG();
- goto shouldnt_be_hashed;
}
static int prepend(char **buffer, int *buflen, const char *str,
@@ -1758,7 +1759,7 @@ static int prepend(char **buffer, int *b
}
/**
- * d_path - return the path of a dentry
+ * __d_path - return the path of a dentry
* @path: the dentry/vfsmount to report
* @root: root vfsmnt/dentry (may be modified by this function)
* @buffer: buffer to return value in
@@ -1845,7 +1846,7 @@ Elong:
*
* Returns the buffer or an error code if the path was too long.
*
- * "buflen" should be positive. Caller holds the dcache_lock.
+ * "buflen" should be positive.
*/
char *d_path(struct path *path, char *buf, int buflen)
{
--
^ permalink raw reply [flat|nested] 6+ messages in thread* [patch 2/3] vfs: dcache cleanups
2008-06-23 16:11 [patch 0/3] vfs: d_path cleanups and fixes Miklos Szeredi
2008-06-23 16:11 ` [patch 1/3] vfs: dcache sparse fixes Miklos Szeredi
@ 2008-06-23 16:11 ` Miklos Szeredi
2008-06-23 16:11 ` [patch 3/3] vfs: fix sys_getcwd for detached mounts Miklos Szeredi
2 siblings, 0 replies; 6+ messages in thread
From: Miklos Szeredi @ 2008-06-23 16:11 UTC (permalink / raw)
To: viro; +Cc: linux-kernel, linux-fsdevel, hch
[-- Attachment #1: vfs-dcache-cleanups.patch --]
[-- Type: text/plain, Size: 2910 bytes --]
From: Miklos Szeredi <mszeredi@suse.cz>
Comment from Al Viro: add prepend_name() wrapper.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---
fs/dcache.c | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
Index: linux-2.6/fs/dcache.c
===================================================================
--- linux-2.6.orig/fs/dcache.c 2008-06-23 17:27:11.000000000 +0200
+++ linux-2.6/fs/dcache.c 2008-06-23 17:55:57.000000000 +0200
@@ -1747,8 +1747,7 @@ shouldnt_be_hashed:
BUG();
}
-static int prepend(char **buffer, int *buflen, const char *str,
- int namelen)
+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
{
*buflen -= namelen;
if (*buflen < 0)
@@ -1758,6 +1757,11 @@ static int prepend(char **buffer, int *b
return 0;
}
+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
+{
+ return prepend(buffer, buflen, name->name, name->len);
+}
+
/**
* __d_path - return the path of a dentry
* @path: the dentry/vfsmount to report
@@ -1780,8 +1784,8 @@ char *__d_path(const struct path *path,
{
struct dentry *dentry = path->dentry;
struct vfsmount *vfsmnt = path->mnt;
- char * end = buffer+buflen;
- char * retval;
+ char *end = buffer + buflen;
+ char *retval;
prepend(&end, &buflen, "\0", 1);
if (!IS_ROOT(dentry) && d_unhashed(dentry) &&
@@ -1813,8 +1817,7 @@ char *__d_path(const struct path *path,
}
parent = dentry->d_parent;
prefetch(parent);
- if ((prepend(&end, &buflen, dentry->d_name.name,
- dentry->d_name.len) != 0) ||
+ if ((prepend_name(&end, &buflen, &dentry->d_name) != 0) ||
(prepend(&end, &buflen, "/", 1) != 0))
goto Elong;
retval = end;
@@ -1825,8 +1828,7 @@ char *__d_path(const struct path *path,
global_root:
retval += 1; /* hit the slash */
- if (prepend(&retval, &buflen, dentry->d_name.name,
- dentry->d_name.len) != 0)
+ if (prepend_name(&retval, &buflen, &dentry->d_name) != 0)
goto Elong;
root->mnt = vfsmnt;
root->dentry = dentry;
@@ -1916,16 +1918,11 @@ char *dentry_path(struct dentry *dentry,
retval = end-1;
*retval = '/';
- for (;;) {
- struct dentry *parent;
- if (IS_ROOT(dentry))
- break;
+ while (!IS_ROOT(dentry)) {
+ struct dentry *parent = dentry->d_parent;
- parent = dentry->d_parent;
prefetch(parent);
-
- if ((prepend(&end, &buflen, dentry->d_name.name,
- dentry->d_name.len) != 0) ||
+ if ((prepend_name(&end, &buflen, &dentry->d_name) != 0) ||
(prepend(&end, &buflen, "/", 1) != 0))
goto Elong;
@@ -1976,7 +1973,7 @@ asmlinkage long sys_getcwd(char __user *
error = -ENOENT;
/* Has the current directory has been unlinked? */
spin_lock(&dcache_lock);
- if (pwd.dentry->d_parent == pwd.dentry || !d_unhashed(pwd.dentry)) {
+ if (IS_ROOT(pwd.dentry) || !d_unhashed(pwd.dentry)) {
unsigned long len;
struct path tmp = root;
char * cwd;
--
^ permalink raw reply [flat|nested] 6+ messages in thread* [patch 3/3] vfs: fix sys_getcwd for detached mounts
2008-06-23 16:11 [patch 0/3] vfs: d_path cleanups and fixes Miklos Szeredi
2008-06-23 16:11 ` [patch 1/3] vfs: dcache sparse fixes Miklos Szeredi
2008-06-23 16:11 ` [patch 2/3] vfs: dcache cleanups Miklos Szeredi
@ 2008-06-23 16:11 ` Miklos Szeredi
2008-06-23 16:53 ` Miklos Szeredi
2 siblings, 1 reply; 6+ messages in thread
From: Miklos Szeredi @ 2008-06-23 16:11 UTC (permalink / raw)
To: viro; +Cc: linux-kernel, linux-fsdevel, hch
[-- Attachment #1: vfs-fix-sys_getcwd-for-detached-mounts.patch --]
[-- Type: text/plain, Size: 1396 bytes --]
From: Miklos Szeredi <mszeredi@suse.cz>
Currently getcwd(2) on a detached mount will give a garbled result:
> mkdir /mnt/foo
> mount --bind /etc /mnt/foo
> cd /mnt/foo/skel
> /bin/pwd
/mnt/foo/skel
> umount -l /mnt/foo
> /bin/pwd
etcskel
After the patch it will give "detached:skel" as result.
Thanks to John Johansen for pointing out this bug.
Comment from Al Viro: use "detached:" prefix to differentiate it from
attached paths.
Reported-by: John Johansen <jjohansen@suse.de>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---
fs/dcache.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
Index: linux-2.6/fs/dcache.c
===================================================================
--- linux-2.6.orig/fs/dcache.c 2008-06-23 17:35:39.000000000 +0200
+++ linux-2.6/fs/dcache.c 2008-06-23 17:46:05.000000000 +0200
@@ -1828,8 +1828,16 @@ char *__d_path(const struct path *path,
global_root:
retval += 1; /* hit the slash */
- if (prepend_name(&retval, &buflen, &dentry->d_name) != 0)
- goto Elong;
+
+ if (IS_ROOT(dentry)) {
+ /* Attached, or pseudo filesystem with "foo:" prefix */
+ if (prepend_name(&retval, &buflen, &dentry->d_name) != 0)
+ goto Elong;
+ } else {
+ /* Detached */
+ if (prepend(&retval, &buflen, "detached:", 9) != 0)
+ goto Elong;
+ }
root->mnt = vfsmnt;
root->dentry = dentry;
return retval;
--
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch 3/3] vfs: fix sys_getcwd for detached mounts
2008-06-23 16:11 ` [patch 3/3] vfs: fix sys_getcwd for detached mounts Miklos Szeredi
@ 2008-06-23 16:53 ` Miklos Szeredi
2008-06-23 16:58 ` Miklos Szeredi
0 siblings, 1 reply; 6+ messages in thread
From: Miklos Szeredi @ 2008-06-23 16:53 UTC (permalink / raw)
To: viro; +Cc: linux-kernel, linux-fsdevel, hch
> From: Miklos Szeredi <mszeredi@suse.cz>
>
> Currently getcwd(2) on a detached mount will give a garbled result:
>
> > mkdir /mnt/foo
> > mount --bind /etc /mnt/foo
> > cd /mnt/foo/skel
> > /bin/pwd
> /mnt/foo/skel
> > umount -l /mnt/foo
> > /bin/pwd
> etcskel
>
> After the patch it will give "detached:skel" as result.
>
> Thanks to John Johansen for pointing out this bug.
>
> Comment from Al Viro: use "detached:" prefix to differentiate it from
> attached paths.
>
> Reported-by: John Johansen <jjohansen@suse.de>
> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
> ---
> fs/dcache.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> Index: linux-2.6/fs/dcache.c
> ===================================================================
> --- linux-2.6.orig/fs/dcache.c 2008-06-23 17:35:39.000000000 +0200
> +++ linux-2.6/fs/dcache.c 2008-06-23 17:46:05.000000000 +0200
> @@ -1828,8 +1828,16 @@ char *__d_path(const struct path *path,
>
> global_root:
> retval += 1; /* hit the slash */
> - if (prepend_name(&retval, &buflen, &dentry->d_name) != 0)
> - goto Elong;
> +
> + if (IS_ROOT(dentry)) {
> + /* Attached, or pseudo filesystem with "foo:" prefix */
> + if (prepend_name(&retval, &buflen, &dentry->d_name) != 0)
> + goto Elong;
> + } else {
> + /* Detached */
> + if (prepend(&retval, &buflen, "detached:", 9) != 0)
> + goto Elong;
> + }
> root->mnt = vfsmnt;
> root->dentry = dentry;
> return retval;
>
> --
>
Darn, this is wrong. It should be looking at vfsmnt->mnt_namespace ==
NULL.
Fixed patch coming up.
Miklos
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch 3/3] vfs: fix sys_getcwd for detached mounts
2008-06-23 16:53 ` Miklos Szeredi
@ 2008-06-23 16:58 ` Miklos Szeredi
0 siblings, 0 replies; 6+ messages in thread
From: Miklos Szeredi @ 2008-06-23 16:58 UTC (permalink / raw)
To: viro; +Cc: linux-kernel, linux-fsdevel, hch
> Darn, this is wrong. It should be looking at vfsmnt->mnt_namespace ==
> NULL.
>
> Fixed patch coming up.
And the thing is: getcwd() did return garbage for detached mounts,
except if the mounted dentry was the root of the filesystem. Which
makes the "detached:..." change slightly prone to breaking something.
Still not very likely, but...
Miklos
^ permalink raw reply [flat|nested] 6+ messages in thread