diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-10-08 03:42:03 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-10-08 03:42:03 +0000 |
| commit | 6ea75952d7c671ea8b0d7b66f82afcafbb5d20c2 (patch) | |
| tree | 66cf5e73830d2730866f7e6bf6cf93f0684c5b99 /fs/cifs/ioctl.c | |
| parent | 6b0cd00bc396daf5c2dcf17a8d82055335341f46 (diff) | |
| parent | d2445556137c38ae15d3191174bfd235630ed7cd (diff) | |
| download | kernel_samsung_espresso10-6ea75952d7c671ea8b0d7b66f82afcafbb5d20c2.zip kernel_samsung_espresso10-6ea75952d7c671ea8b0d7b66f82afcafbb5d20c2.tar.gz kernel_samsung_espresso10-6ea75952d7c671ea8b0d7b66f82afcafbb5d20c2.tar.bz2 | |
Merge branch 'for-next'
Diffstat (limited to 'fs/cifs/ioctl.c')
| -rw-r--r-- | fs/cifs/ioctl.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c index 9d38a71..077bf75 100644 --- 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"); |