nfsd4: remove some dprintk's

[safe/jmp/linux-2.6] / fs / cifs / ioctl.c

diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c
index 711bb7a..f946506 100644 (file)
--- a/fs/cifs/ioctl.c
+++ b/fs/cifs/ioctl.c
@@ -3,7 +3,7 @@
  *
  *   vfs operations that deal with io control
  *
- *   Copyright (C) International Business Machines  Corp., 2005
+ *   Copyright (C) International Business Machines  Corp., 2005,2007
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
 #include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifsproto.h"
@@ -31,81 +30,81 @@
 
 #define CIFS_IOC_CHECKUMOUNT _IO(0xCF, 2)
 
-int cifs_ioctl (struct inode * inode, struct file * filep, 
-               unsigned int command, unsigned long arg)
+long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)
 {
+       struct inode *inode = filep->f_dentry->d_inode;
        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;
-#endif /* CONFIG_CIFS_POSIX */
        __u64   caps;
-       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));
+       cFYI(1, ("ioctl file %p  cmd %u  arg %lu", filep, command, arg));
 
        cifs_sb = CIFS_SB(inode->i_sb);
-       tcon = cifs_sb->tcon;
 
-       if(tcon)
+#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 */
 
-       switch(command) {
+       switch (command) {
                case CIFS_IOC_CHECKUMOUNT:
-                       cFYI(1,("User unmount attempted"));
-                       /* BB FIXME - add missing code here FIXME */
-                       if(cifs_sb->mnt_uid == current->uid)
+                       cFYI(1, ("User unmount attempted"));
+                       if (cifs_sb->mnt_uid == current_uid())
                                rc = 0;
                        else {
                                rc = -EACCES;
-                               cFYI(1,("uids do not match"));
+                               cFYI(1, ("uids do not match"));
                        }
                        break;
 #ifdef CONFIG_CIFS_POSIX
-               case EXT2_IOC_GETFLAGS:
-                       if(CIFS_UNIX_EXTATTR_CAP & caps) {
+               case FS_IOC_GETFLAGS:
+                       if (CIFS_UNIX_EXTATTR_CAP & caps) {
                                if (pSMBFile == NULL)
-                                       goto cifs_ioctl_out;
+                                       break;
                                rc = CIFSGetExtAttr(xid, tcon, pSMBFile->netfid,
                                        &ExtAttrBits, &ExtAttrMask);
-                               if(rc == 0)
+                               if (rc == 0)
                                        rc = put_user(ExtAttrBits &
-                                               EXT2_FL_USER_VISIBLE,
+                                               FS_FL_USER_VISIBLE,
                                                (int __user *)arg);
                        }
                        break;
 
-               case EXT2_IOC_SETFLAGS:
-                       if(CIFS_UNIX_EXTATTR_CAP & caps) {
-                               if(get_user(ExtAttrBits,(int __user *)arg)) {
+               case FS_IOC_SETFLAGS:
+                       if (CIFS_UNIX_EXTATTR_CAP & caps) {
+                               if (get_user(ExtAttrBits, (int __user *)arg)) {
                                        rc = -EFAULT;
-                                       goto cifs_ioctl_out;
+                                       break;
                                }
                                if (pSMBFile == NULL)
-                                       goto cifs_ioctl_out;
+                                       break;
                                /* rc= CIFSGetExtAttr(xid,tcon,pSMBFile->netfid,
                                        extAttrBits, &ExtAttrMask);*/
-                               
                        }
-                       cFYI(1,("set flags not implemented yet"));
+                       cFYI(1, ("set flags not implemented yet"));
                        break;
 #endif /* CONFIG_CIFS_POSIX */
                default:
-                       cFYI(1,("unsupported ioctl"));
+                       cFYI(1, ("unsupported ioctl"));
                        break;
        }
 
-cifs_ioctl_out:
        FreeXid(xid);
        return rc;
-} 
+}