Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] list entry can not return null
  turn cifs_setattr into a multiplexor that calls the correct function
  move file time and dos attribute setting logic into new function
  spin off cifs_setattr with unix extensions to its own function
  [CIFS] Code cleanup in old sessionsetup code
  [CIFS] cifs_mkdir and cifs_create should respect the setgid bit on parent dir
  Rename CIFSSMBSetFileTimes to CIFSSMBSetFileInfo and add PID arg
  change CIFSSMBSetTimes to CIFSSMBSetPathInfo
  [CIFS] fix trailing whitespace
  bundle up Unix SET_PATH_INFO args into a struct and change name
  Fix missing braces in cifs_revalidate()
  remove locking around tcpSesAllocCount atomic variable
  [CIFS] properly account for new user= field in SPNEGO upcall string allocation
  [CIFS] remove level of indentation from decode_negTokenInit
  [CIFS] cifs send2 not retrying enough in some cases on full socket
  [CIFS] oid should also be checked against class in cifs asn

1 files changed, 33 insertions, 38 deletions

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 1ec7076f7b24..e8da4ee761b5 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -930,36 +930,34 @@ static int cifs_oplock_thread(void *dummyarg)
                         schedule_timeout(39*HZ);
                 } else {
                         oplock_item = list_entry(GlobalOplock_Q.next,
-                                struct oplock_q_entry, qhead);
-                        if (oplock_item) {
-                                cFYI(1, ("found oplock item to write out"));
-                                pTcon = oplock_item->tcon;
-                                inode = oplock_item->pinode;
-                                netfid = oplock_item->netfid;
-                                spin_unlock(&GlobalMid_Lock);
-                                DeleteOplockQEntry(oplock_item);
-                                /* can not grab inode sem here since it would
+                                                struct oplock_q_entry, qhead);
+                        cFYI(1, ("found oplock item to write out"));
+                        pTcon = oplock_item->tcon;
+                        inode = oplock_item->pinode;
+                        netfid = oplock_item->netfid;
+                        spin_unlock(&GlobalMid_Lock);
+                        DeleteOplockQEntry(oplock_item);
+                        /* can not grab inode sem here since it would
                                 deadlock when oplock received on delete
                                 since vfs_unlink holds the i_mutex across
                                 the call */
-                                /* mutex_lock(&inode->i_mutex);*/
-                                if (S_ISREG(inode->i_mode)) {
-                                        rc =
-                                           filemap_fdatawrite(inode->i_mapping);
-                                        if (CIFS_I(inode)->clientCanCacheRead
-                                                                         == 0) {
-                                                waitrc = filemap_fdatawait(inode->i_mapping);
-                                                invalidate_remote_inode(inode);
-                                        }
-                                        if (rc == 0)
-                                                rc = waitrc;
-                                } else
-                                        rc = 0;
-                                /* mutex_unlock(&inode->i_mutex);*/
-                                if (rc)
-                                        CIFS_I(inode)->write_behind_rc = rc;
-                                cFYI(1, ("Oplock flush inode %p rc %d",
-                                        inode, rc));
+                        /* mutex_lock(&inode->i_mutex);*/
+                        if (S_ISREG(inode->i_mode)) {
+                                rc = filemap_fdatawrite(inode->i_mapping);
+                                if (CIFS_I(inode)->clientCanCacheRead == 0) {
+                                        waitrc = filemap_fdatawait(
+                                                              inode->i_mapping);
+                                        invalidate_remote_inode(inode);
+                                }
+                                if (rc == 0)
+                                        rc = waitrc;
+                        } else
+                                rc = 0;
+                        /* mutex_unlock(&inode->i_mutex);*/
+                        if (rc)
+                                CIFS_I(inode)->write_behind_rc = rc;
+                        cFYI(1, ("Oplock flush inode %p rc %d",
+                                inode, rc));
 
                                 /* releasing stale oplock after recent reconnect
                                 of smb session using a now incorrect file
@@ -967,15 +965,13 @@ static int cifs_oplock_thread(void *dummyarg)
                                 not bother sending an oplock release if session
                                 to server still is disconnected since oplock
                                 already released by the server in that case */
-                                if (pTcon->tidStatus != CifsNeedReconnect) {
-                                    rc = CIFSSMBLock(0, pTcon, netfid,
-                                            0 /* len */ , 0 /* offset */, 0,
-                                            0, LOCKING_ANDX_OPLOCK_RELEASE,
-                                            false /* wait flag */);
-                                        cFYI(1, ("Oplock release rc = %d", rc));
-                                }
-                        } else
-                                spin_unlock(&GlobalMid_Lock);
+                        if (pTcon->tidStatus != CifsNeedReconnect) {
+                                rc = CIFSSMBLock(0, pTcon, netfid,
+                                                0 /* len */ , 0 /* offset */, 0,
+                                                0, LOCKING_ANDX_OPLOCK_RELEASE,
+                                                false /* wait flag */);
+                                cFYI(1, ("Oplock release rc = %d", rc));
+                        }
                         set_current_state(TASK_INTERRUPTIBLE);
                         schedule_timeout(1);  /* yield in case q were corrupt */
                 }
@@ -1001,8 +997,7 @@ static int cifs_dnotify_thread(void *dummyarg)
                 list_for_each(tmp, &GlobalSMBSessionList) {
                         ses = list_entry(tmp, struct cifsSesInfo,
                                 cifsSessionList);
-                        if (ses && ses->server &&
-                             atomic_read(&ses->server->inFlight))
+                        if (ses->server && atomic_read(&ses->server->inFlight))
                                 wake_up_all(&ses->server->response_q);
                 }
                 read_unlock(&GlobalSMBSeslock);