cifs: convert GlobalSMBSeslock from a rwlock to regular spinlock

[mv-sheeva.git] / fs / cifs / readdir.c

diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index 887a7e230376175f0ccffc54e99bd9f23cbc1949..ef7bb7b50f58e679ffabb8b8dad65420efb81271 100644 (file)
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -223,33 +223,35 @@ int get_symlink_reparse_path(char *full_path, struct cifs_sb_info *cifs_sb,
 static int initiate_cifs_search(const int xid, struct file *file)
 {
        int rc = 0;
-       char *full_path;
+       char *full_path = NULL;
        struct cifsFileInfo *cifsFile;
-       struct cifs_sb_info *cifs_sb;
+       struct cifs_sb_info *cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
+       struct tcon_link *tlink;
        struct cifsTconInfo *pTcon;
 
-       cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
-       if (cifs_sb == NULL)
-               return -EINVAL;
+       tlink = cifs_sb_tlink(cifs_sb);
+       if (IS_ERR(tlink))
+               return PTR_ERR(tlink);
+       pTcon = tlink_tcon(tlink);
 
        if (file->private_data == NULL)
                file->private_data =
                        kzalloc(sizeof(struct cifsFileInfo), GFP_KERNEL);
+       if (file->private_data == NULL) {
+               rc = -ENOMEM;
+               goto error_exit;
+       }
 
-       if (file->private_data == NULL)
-               return -ENOMEM;
        cifsFile = file->private_data;
        cifsFile->invalidHandle = true;
        cifsFile->srch_inf.endOfSearch = false;
-       cifsFile->tcon = cifs_sb_tcon(cifs_sb);
-       pTcon = cifsFile->tcon;
-       if (pTcon == NULL)
-               return -EINVAL;
+       cifsFile->tlink = cifs_get_tlink(tlink);
 
        full_path = build_path_from_dentry(file->f_path.dentry);
-
-       if (full_path == NULL)
-               return -ENOMEM;
+       if (full_path == NULL) {
+               rc = -ENOMEM;
+               goto error_exit;
+       }
 
        cFYI(1, "Full path: %s start at: %lld", full_path, file->f_pos);
 
@@ -282,7 +284,9 @@ ffirst_retry:
                cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_SERVER_INUM;
                goto ffirst_retry;
        }
+error_exit:
        kfree(full_path);
+       cifs_put_tlink(tlink);
        return rc;
 }
 
@@ -524,14 +528,14 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
           (index_to_find < first_entry_in_buffer)) {
                /* close and restart search */
                cFYI(1, "search backing up - close and restart search");
-               write_lock(&GlobalSMBSeslock);
+               spin_lock(&cifs_file_list_lock);
                if (!cifsFile->srch_inf.endOfSearch &&
                    !cifsFile->invalidHandle) {
                        cifsFile->invalidHandle = true;
-                       write_unlock(&GlobalSMBSeslock);
+                       spin_unlock(&cifs_file_list_lock);
                        CIFSFindClose(xid, pTcon, cifsFile->netfid);
                } else
-                       write_unlock(&GlobalSMBSeslock);
+                       spin_unlock(&cifs_file_list_lock);
                if (cifsFile->srch_inf.ntwrk_buf_start) {
                        cFYI(1, "freeing SMB ff cache buf on search rewind");
                        if (cifsFile->srch_inf.smallBuf)
@@ -786,6 +790,17 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
 
        cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
 
+       /*
+        * Ensure FindFirst doesn't fail before doing filldir() for '.' and
+        * '..'. Otherwise we won't be able to notify VFS in case of failure.
+        */
+       if (file->private_data == NULL) {
+               rc = initiate_cifs_search(xid, file);
+               cFYI(1, "initiate cifs search rc %d", rc);
+               if (rc)
+                       goto rddir2_exit;
+       }
+
        switch ((int) file->f_pos) {
        case 0:
                if (filldir(direntry, ".", 1, file->f_pos,
@@ -809,14 +824,6 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                        if it before then restart search
                        if after then keep searching till find it */
 
-               if (file->private_data == NULL) {
-                       rc = initiate_cifs_search(xid, file);
-                       cFYI(1, "initiate cifs search rc %d", rc);
-                       if (rc) {
-                               FreeXid(xid);
-                               return rc;
-                       }
-               }
                if (file->private_data == NULL) {
                        rc = -EINVAL;
                        FreeXid(xid);
@@ -834,7 +841,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                        CIFSFindClose(xid, pTcon, cifsFile->netfid);
                } */
 
-               pTcon = cifsFile->tcon;
+               pTcon = tlink_tcon(cifsFile->tlink);
                rc = find_cifs_entry(xid, pTcon, file,
                                &current_entry, &num_to_fill);
                if (rc) {