Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

[pandora-kernel.git] / fs / cifs / ioctl.c

diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c
index 7b84b2b..b0ea668 100644 (file)
--- a/fs/cifs/ioctl.c
+++ b/fs/cifs/ioctl.c
@@ -27,41 +27,57 @@
 #include "cifsglob.h"
 #include "cifsproto.h"
 #include "cifs_debug.h"
+#include "cifsfs.h"
+
+#define CIFS_IOC_CHECKUMOUNT _IO(0xCF, 2)
 
 int cifs_ioctl (struct inode * inode, struct file * filep, 
                unsigned int command, unsigned long arg)
 {
        int rc = -ENOTTY; /* strange error - but the precedent */
+       int xid;
+       struct cifs_sb_info *cifs_sb;
 #ifdef CONFIG_CIFS_POSIX
        __u64   ExtAttrBits = 0;
        __u64   ExtAttrMask = 0;
        __u64   caps;
-#endif /* CONFIG_CIFS_POSIX */
-       int xid;
-       struct cifs_sb_info *cifs_sb;
        struct cifsTconInfo *tcon;
        struct cifsFileInfo *pSMBFile =
                (struct cifsFileInfo *)filep->private_data;
+#endif /* CONFIG_CIFS_POSIX */
 
        xid = GetXid();
 
+        cFYI(1,("ioctl file %p  cmd %u  arg %lu",filep,command,arg));
+
        cifs_sb = CIFS_SB(inode->i_sb);
-       tcon = cifs_sb->tcon;
-       if (pSMBFile == NULL)
-               goto cifs_ioctl_out;
 
 #ifdef CONFIG_CIFS_POSIX
+       tcon = cifs_sb->tcon;
        if(tcon)
                caps = le64_to_cpu(tcon->fsUnixInfo.Capability);
        else {
                rc = -EIO;
-               goto cifs_ioctl_out;
+               FreeXid(xid);
+               return -EIO;
        }
+#endif /* CONFIG_CIFS_POSIX */
 
-       cFYI(1,("ioctl file %p  cmd %u  arg %lu",filep,command,arg));
        switch(command) {
+               case CIFS_IOC_CHECKUMOUNT:
+                       cFYI(1,("User unmount attempted"));
+                       if(cifs_sb->mnt_uid == current->uid)
+                               rc = 0;
+                       else {
+                               rc = -EACCES;
+                               cFYI(1,("uids do not match"));
+                       }
+                       break;
+#ifdef CONFIG_CIFS_POSIX
                case EXT2_IOC_GETFLAGS:
                        if(CIFS_UNIX_EXTATTR_CAP & caps) {
+                               if (pSMBFile == NULL)
+                                       break;
                                rc = CIFSGetExtAttr(xid, tcon, pSMBFile->netfid,
                                        &ExtAttrBits, &ExtAttrMask);
                                if(rc == 0)
@@ -75,21 +91,22 @@ int cifs_ioctl (struct inode * inode, struct file * filep,
                        if(CIFS_UNIX_EXTATTR_CAP & caps) {
                                if(get_user(ExtAttrBits,(int __user *)arg)) {
                                        rc = -EFAULT;
-                                       goto cifs_ioctl_out;
+                                       break;
                                }
-                         /* rc = CIFSGetExtAttr(xid, tcon, pSMBFile->netfid,
+                               if (pSMBFile == NULL)
+                                       break;
+                               /* rc= CIFSGetExtAttr(xid,tcon,pSMBFile->netfid,
                                        extAttrBits, &ExtAttrMask);*/
                                
                        }
                        cFYI(1,("set flags not implemented yet"));
                        break;
+#endif /* CONFIG_CIFS_POSIX */
                default:
                        cFYI(1,("unsupported ioctl"));
-                       return rc;
+                       break;
        }
-#endif /* CONFIG_CIFS_POSIX */
 
-cifs_ioctl_out:
        FreeXid(xid);
        return rc;
 }