Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

fs/cifs/cifsfs.c

@@ -512,7 +512,7 @@ struct inode_operations cifs_file_inode_ops = {
 };
 
 struct inode_operations cifs_symlink_inode_ops = {
-	.readlink = cifs_readlink,
+	.readlink = generic_readlink, 
 	.follow_link = cifs_follow_link,
 	.put_link = cifs_put_link,
 	.permission = cifs_permission,

fs/cifs/link.c

@@ -106,7 +106,7 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
 	up(&direntry->d_sb->s_vfs_rename_sem);
 
 	if (!full_path)
-		goto out;
+		goto out_no_free;
 
 	cFYI(1, ("Full path: %s inode = 0x%p", full_path, inode));
 	cifs_sb = CIFS_SB(inode->i_sb);
@@ -126,9 +126,8 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
 	else {
 		/* rc = CIFSSMBQueryReparseLinkInfo */
 		/* BB Add code to Query ReparsePoint info */
+		/* BB Add MAC style xsymlink check here if enabled */
 	}
-	/* BB Anything else to do to handle recursive links? */
-	/* BB Should we be using page symlink ops here? */
 
 	if (rc == 0) {
 
@@ -142,6 +141,7 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
 
 out:
 	kfree(full_path);
+out_no_free:
 	FreeXid(xid);
 	nd_set_link(nd, target_path);
 	return 0;