X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fs%2Fnamespace.c;h=1c09cab8f7cf7c4faea9b1e0e4aa8fc6382824c4;hb=75329f1f0c0e2e2ad611734a2ef08309391a4d9f;hp=cce46702d33c98f6d9e1669ac10f4d6c23be82c2;hpb=24924f884cd36603615ea5496244e542b0b513c6;p=linux-2.6-block.git

diff --git a/fs/namespace.c b/fs/namespace.c
index cce46702d33c..1c09cab8f7cf 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1176,7 +1176,7 @@ static int mount_is_safe(struct path *path)
 	if (S_ISLNK(path->dentry->d_inode->i_mode))
 		return -EPERM;
 	if (path->dentry->d_inode->i_mode & S_ISVTX) {
-		if (current->uid != path->dentry->d_inode->i_uid)
+		if (current_uid() != path->dentry->d_inode->i_uid)
 			return -EPERM;
 	}
 	if (inode_permission(path->dentry->d_inode, MAY_WRITE))
@@ -1815,8 +1815,8 @@ static void shrink_submounts(struct vfsmount *mnt, struct list_head *umounts)
 		while (!list_empty(&graveyard)) {
 			m = list_first_entry(&graveyard, struct vfsmount,
 						mnt_expire);
-			touch_mnt_namespace(mnt->mnt_ns);
-			umount_tree(mnt, 1, umounts);
+			touch_mnt_namespace(m->mnt_ns);
+			umount_tree(m, 1, umounts);
 		}
 	}
 }