Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/ide/ide-io.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

5 files changed, 72 insertions, 64 deletions

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 5759ba53dc96..d06260251c30 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -2475,7 +2475,7 @@ querySymLinkRetry:
                         /* BB FIXME investigate remapping reserved chars here */
                         *symlinkinfo = cifs_strndup_from_ucs(data_start, count,
                                                     is_unicode, nls_codepage);
-                        if (!symlinkinfo)
+                        if (!*symlinkinfo)
                                 rc = -ENOMEM;
                 }
         }
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 11431ed72a7f..f49d684edd96 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -225,6 +225,7 @@ int cifs_posix_open(char *full_path, struct inode **pinode,
         if (!(oflags & FMODE_READ))
                 write_only = true;
 
+        mode &= ~current_umask();
         rc = CIFSPOSIXCreate(xid, cifs_sb->tcon, posix_flags, mode,
                         pnetfid, presp_data, &oplock, full_path,
                         cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
@@ -310,7 +311,6 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
                 return -ENOMEM;
         }
 
-        mode &= ~current_umask();
         if (oplockEnabled)
                 oplock = REQ_OPLOCK;
 
@@ -336,7 +336,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
                         else /* success, no need to query */
                                 goto cifs_create_set_dentry;
                 } else if ((rc != -EIO) && (rc != -EREMOTE) &&
-                         (rc != -EOPNOTSUPP)) /* path not found or net err */
+                         (rc != -EOPNOTSUPP) && (rc != -EINVAL))
                         goto cifs_create_out;
                 /* else fallthrough to retry, using older open call, this is
                    case where server does not support this SMB level, and
@@ -609,7 +609,6 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
         int xid;
         int rc = 0; /* to get around spurious gcc warning, set to zero here */
         int oplock = 0;
-        int mode;
         __u16 fileHandle = 0;
         bool posix_open = false;
         struct cifs_sb_info *cifs_sb;
@@ -660,13 +659,12 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
 
         if (pTcon->unix_ext) {
                 if (!(nd->flags & (LOOKUP_PARENT | LOOKUP_DIRECTORY)) &&
-                                (nd->flags & LOOKUP_OPEN)) {
+                     (nd->flags & LOOKUP_OPEN) && !pTcon->broken_posix_open) {
                         if (!((nd->intent.open.flags & O_CREAT) &&
                                         (nd->intent.open.flags & O_EXCL))) {
-                                mode = nd->intent.open.create_mode &
-                                                ~current_umask();
                                 rc = cifs_posix_open(full_path, &newInode,
-                                        parent_dir_inode->i_sb, mode,
+                                        parent_dir_inode->i_sb,
+                                        nd->intent.open.create_mode,
                                         nd->intent.open.flags, &oplock,
                                         &fileHandle, xid);
                                 /*
@@ -681,6 +679,8 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
                                  */
                                 if ((rc != -EINVAL) && (rc != -EOPNOTSUPP))
                                         posix_open = true;
+                                else
+                                        pTcon->broken_posix_open = true;
                         }
                 }
                 if (!posix_open)
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 38c06f826575..302ea15f02e6 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -130,10 +130,6 @@ static inline int cifs_posix_open_inode_helper(struct inode *inode,
                         struct cifsFileInfo *pCifsFile, int oplock, u16 netfid)
 {
 
-        file->private_data = kmalloc(sizeof(struct cifsFileInfo), GFP_KERNEL);
-        if (file->private_data == NULL)
-                return -ENOMEM;
-        pCifsFile = cifs_init_private(file->private_data, inode, file, netfid);
         write_lock(&GlobalSMBSeslock);
 
         pCifsInode = CIFS_I(file->f_path.dentry->d_inode);
@@ -184,6 +180,38 @@ psx_client_can_cache:
         return 0;
 }
 
+static struct cifsFileInfo *
+cifs_fill_filedata(struct file *file)
+{
+        struct list_head *tmp;
+        struct cifsFileInfo *pCifsFile = NULL;
+        struct cifsInodeInfo *pCifsInode = NULL;
+
+        /* search inode for this file and fill in file->private_data */
+        pCifsInode = CIFS_I(file->f_path.dentry->d_inode);
+        read_lock(&GlobalSMBSeslock);
+        list_for_each(tmp, &pCifsInode->openFileList) {
+                pCifsFile = list_entry(tmp, struct cifsFileInfo, flist);
+                if ((pCifsFile->pfile == NULL) &&
+                    (pCifsFile->pid == current->tgid)) {
+                        /* mode set in cifs_create */
+
+                        /* needed for writepage */
+                        pCifsFile->pfile = file;
+                        file->private_data = pCifsFile;
+                        break;
+                }
+        }
+        read_unlock(&GlobalSMBSeslock);
+
+        if (file->private_data != NULL) {
+                return pCifsFile;
+        } else if ((file->f_flags & O_CREAT) && (file->f_flags & O_EXCL))
+                        cERROR(1, ("could not find file instance for "
+                                   "new file %p", file));
+        return NULL;
+}
+
 /* all arguments to this function must be checked for validity in caller */
 static inline int cifs_open_inode_helper(struct inode *inode, struct file *file,
         struct cifsInodeInfo *pCifsInode, struct cifsFileInfo *pCifsFile,
@@ -258,7 +286,6 @@ int cifs_open(struct inode *inode, struct file *file)
         struct cifsTconInfo *tcon;
         struct cifsFileInfo *pCifsFile;
         struct cifsInodeInfo *pCifsInode;
-        struct list_head *tmp;
         char *full_path = NULL;
         int desiredAccess;
         int disposition;
@@ -270,32 +297,12 @@ int cifs_open(struct inode *inode, struct file *file)
         cifs_sb = CIFS_SB(inode->i_sb);
         tcon = cifs_sb->tcon;
 
-        /* search inode for this file and fill in file->private_data */
         pCifsInode = CIFS_I(file->f_path.dentry->d_inode);
-        read_lock(&GlobalSMBSeslock);
-        list_for_each(tmp, &pCifsInode->openFileList) {
-                pCifsFile = list_entry(tmp, struct cifsFileInfo,
-                                       flist);
-                if ((pCifsFile->pfile == NULL) &&
-                    (pCifsFile->pid == current->tgid)) {
-                        /* mode set in cifs_create */
-
-                        /* needed for writepage */
-                        pCifsFile->pfile = file;
-
-                        file->private_data = pCifsFile;
-                        break;
-                }
-        }
-        read_unlock(&GlobalSMBSeslock);
-
-        if (file->private_data != NULL) {
-                rc = 0;
+        pCifsFile = cifs_fill_filedata(file);
+        if (pCifsFile) {
                 FreeXid(xid);
-                return rc;
-        } else if ((file->f_flags & O_CREAT) && (file->f_flags & O_EXCL))
-                        cERROR(1, ("could not find file instance for "
-                                   "new file %p", file));
+                return 0;
+        }
 
         full_path = build_path_from_dentry(file->f_path.dentry);
         if (full_path == NULL) {
@@ -325,6 +332,7 @@ int cifs_open(struct inode *inode, struct file *file)
                         /* no need for special case handling of setting mode
                            on read only files needed here */
 
+                        pCifsFile = cifs_fill_filedata(file);
                         cifs_posix_open_inode_helper(inode, file, pCifsInode,
                                                      pCifsFile, oplock, netfid);
                         goto out;
diff --git a/fs/cifs/link.c b/fs/cifs/link.c
index ea9d11e3dcbb..cd83c53fcbb5 100644
--- a/fs/cifs/link.c
+++ b/fs/cifs/link.c
@@ -107,48 +107,48 @@ void *
 cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
 {
         struct inode *inode = direntry->d_inode;
-        int rc = -EACCES;
+        int rc = -ENOMEM;
         int xid;
         char *full_path = NULL;
-        char *target_path = ERR_PTR(-ENOMEM);
-        struct cifs_sb_info *cifs_sb;
-        struct cifsTconInfo *pTcon;
+        char *target_path = NULL;
+        struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
+        struct cifsTconInfo *tcon = cifs_sb->tcon;
 
         xid = GetXid();
 
-        full_path = build_path_from_dentry(direntry);
+        /*
+         * For now, we just handle symlinks with unix extensions enabled.
+         * Eventually we should handle NTFS reparse points, and MacOS
+         * symlink support. For instance...
+         *
+         * rc = CIFSSMBQueryReparseLinkInfo(...)
+         *
+         * For now, just return -EACCES when the server doesn't support posix
+         * extensions. Note that we still allow querying symlinks when posix
+         * extensions are manually disabled. We could disable these as well
+         * but there doesn't seem to be any harm in allowing the client to
+         * read them.
+         */
+        if (!(tcon->ses->capabilities & CAP_UNIX)) {
+                rc = -EACCES;
+                goto out;
+        }
 
+        full_path = build_path_from_dentry(direntry);
         if (!full_path)
                 goto out;
 
         cFYI(1, ("Full path: %s inode = 0x%p", full_path, inode));
-        cifs_sb = CIFS_SB(inode->i_sb);
-        pTcon = cifs_sb->tcon;
-
-        /* We could change this to:
-                if (pTcon->unix_ext)
-           but there does not seem any point in refusing to
-           get symlink info if we can, even if unix extensions
-           turned off for this mount */
-
-        if (pTcon->ses->capabilities & CAP_UNIX)
-                rc = CIFSSMBUnixQuerySymLink(xid, pTcon, full_path,
-                                             &target_path,
-                                             cifs_sb->local_nls);
-        else {
-                /* BB add read reparse point symlink code here */
-                /* rc = CIFSSMBQueryReparseLinkInfo */
-                /* BB Add code to Query ReparsePoint info */
-                /* BB Add MAC style xsymlink check here if enabled */
-        }
 
+        rc = CIFSSMBUnixQuerySymLink(xid, tcon, full_path, &target_path,
+                                     cifs_sb->local_nls);
+        kfree(full_path);
+out:
         if (rc != 0) {
                 kfree(target_path);
                 target_path = ERR_PTR(rc);
         }
 
-        kfree(full_path);
-out:
         FreeXid(xid);
         nd_set_link(nd, target_path);
         return NULL;
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index 50ff3f2cdf24..d6759b92006f 100644
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -576,7 +576,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
         ret = nilfs_clean_segments(inode->i_sb, argv, kbufs);
 
  out_free:
-        while (--n > 0)
+        while (--n >= 0)
                 vfree(kbufs[n]);
         kfree(kbufs[4]);
         return ret;