[CIFS] move close processing from cifs_close to cifsFileInfo_put

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

diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c
index 9d38a71..077bf75 100644 (file)
--- a/fs/cifs/ioctl.c
+++ b/fs/cifs/ioctl.c
@@ -37,11 +37,11 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)
        int xid;
        struct cifs_sb_info *cifs_sb;
 #ifdef CONFIG_CIFS_POSIX
+       struct cifsFileInfo *pSMBFile = filep->private_data;
+       struct cifsTconInfo *tcon = tlink_tcon(pSMBFile->tlink);
        __u64   ExtAttrBits = 0;
        __u64   ExtAttrMask = 0;
-       __u64   caps;
-       struct cifsTconInfo *tcon;
-       struct cifsFileInfo *pSMBFile = filep->private_data;
+       __u64   caps = le64_to_cpu(tcon->fsUnixInfo.Capability);
 #endif /* CONFIG_CIFS_POSIX */
 
        xid = GetXid();
@@ -50,17 +50,6 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)
 
        cifs_sb = CIFS_SB(inode->i_sb);
 
-#ifdef CONFIG_CIFS_POSIX
-       tcon = cifs_sb->tcon;
-       if (tcon)
-               caps = le64_to_cpu(tcon->fsUnixInfo.Capability);
-       else {
-               rc = -EIO;
-               FreeXid(xid);
-               return -EIO;
-       }
-#endif /* CONFIG_CIFS_POSIX */
-
        switch (command) {
                case CIFS_IOC_CHECKUMOUNT:
                        cFYI(1, "User unmount attempted");