Merge branches 'acpi-resources', 'acpi-ec' and 'acpi-sleep'

[~andy/linux] / fs / mount.h

diff --git a/fs/mount.h b/fs/mount.h
index d64c594be6c47baf29a70ffe63671f307cba4b7e..a17458ca6f29e4dbf1f1a1b8bb9e97949b279d29 100644 (file)
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -74,7 +74,7 @@ static inline int mnt_has_parent(struct mount *mnt)
 static inline int is_mounted(struct vfsmount *mnt)
 {
        /* neither detached nor internal? */
-       return !IS_ERR_OR_NULL(real_mount(mnt));
+       return !IS_ERR_OR_NULL(real_mount(mnt)->mnt_ns);
 }
 
 extern struct mount *__lookup_mnt(struct vfsmount *, struct dentry *);