From: Steve Muir <smuir@cs.princeton.edu>
Date: Thu, 1 Dec 2005 21:47:35 +0000 (+0000)
Subject: Incorporate forgotten patch
X-Git-Tag: planetlab-3_2-rc6~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a84cac3ece5e8d107d9d0d9f8b3efba400e1cc05;p=linux-2.6.git

Incorporate forgotten patch
---

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 1b18d7414..1f95769c3 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -197,6 +197,22 @@ int vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, unsigned lon
 				error = vx_proc_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
 			break;
 #endif
+		/*
+		 * These cmds needed for PLK - don't lose them!
+		 */
+                case FIOC_SETIATTR:
+                case FIOC_GETIATTR:
+                        /*
+                         * Verify that this filp is a file object,
+                         * not (say) a socket.
+                         */
+                        error = -ENOTTY;
+                        if (S_ISREG(filp->f_dentry->d_inode->i_mode) ||
+                            S_ISDIR(filp->f_dentry->d_inode->i_mode))
+                                error = vc_iattr_ioctl(filp->f_dentry,
+                                                       cmd, arg);
+                        break;
+
 		default:
 			if (S_ISREG(filp->f_dentry->d_inode->i_mode))
 				error = file_ioctl(filp, cmd, arg);