From de956739b39372f0c57e2366fb2947d1eace0bd3 Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mfasheh@suse.com>
Date: Tue, 22 Mar 2011 17:20:26 +0000
Subject: [PATCH] --- yaml --- r: 243170 b: refs/heads/master c:
 3ab3564f018b9b265d0258e4a231794bacd5ad85 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1f0c4b916e73..564d9302fe2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e7cb7fe0c391561bd3af36515be3f3c64a04c6
+refs/heads/master: 3ab3564f018b9b265d0258e4a231794bacd5ad85
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 7a7a202b82ab..67fd6e9552d3 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -4817,7 +4817,7 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,
 
 	/* do not allow sys_link's with other subvols of the same device */
 	if (root->objectid != BTRFS_I(inode)->root->objectid)
-		return -EPERM;
+		return -EXDEV;
 
 	btrfs_inc_nlink(inode);
 	inode->i_ctime = CURRENT_TIME;