diff --git a/[refs] b/[refs] index b70a623197e2..8c88f5c540a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f94b347059809aecd97af53a084fe5f3db045d92 +refs/heads/master: 621997cd392a541bbe964e7521e2e4b2a7a03c4e diff --git a/trunk/fs/9p/vfs_inode.c b/trunk/fs/9p/vfs_inode.c index 18f26cdfd882..05d30e89ba45 100644 --- a/trunk/fs/9p/vfs_inode.c +++ b/trunk/fs/9p/vfs_inode.c @@ -767,7 +767,7 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry, /* 9P can only handle file rename in the same directory */ if (memcmp(&olddirfid->qid, &newdirfid->qid, sizeof(newdirfid->qid))) { dprintk(DEBUG_ERROR, "old dir and new dir are different\n"); - retval = -EPERM; + retval = -EXDEV; goto FreeFcallnBail; }