[CIFS] Do not time out posix brl requests when using new posix setfileinfo

[linux-2.6] / fs / cifs / file.c

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index e9c1573f6aa73992542d1a99d77652e2c9bf6f69..52e2e4c8794b752dca6bec6809aced17a0ddfd73 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -324,7 +324,7 @@ out:
        return rc;
 }
 
-/* Try to reaquire byte range locks that were released when session */
+/* Try to reacquire byte range locks that were released when session */
 /* to server was lost */
 static int cifs_relock_file(struct cifsFileInfo *cifsFile)
 {
@@ -644,8 +644,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
        account for negative length which we can not accept over the
        wire */
        if (IS_GETLK(cmd)) {
-               if(experimEnabled && 
-                  (cifs_sb->tcon->ses->capabilities & CAP_UNIX) &&
+               if((cifs_sb->tcon->ses->capabilities & CAP_UNIX) &&
                   (CIFS_UNIX_FCNTL_CAP & 
                        le64_to_cpu(cifs_sb->tcon->fsUnixInfo.Capability))) {
                        int posix_lock_type;
@@ -683,8 +682,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
                FreeXid(xid);
                return rc;
        }
-       if (experimEnabled &&
-               (cifs_sb->tcon->ses->capabilities & CAP_UNIX) &&
+       if ((cifs_sb->tcon->ses->capabilities & CAP_UNIX) &&
                (CIFS_UNIX_FCNTL_CAP &
                         le64_to_cpu(cifs_sb->tcon->fsUnixInfo.Capability))) {
                int posix_lock_type;
@@ -1942,7 +1940,7 @@ static int cifs_prepare_write(struct file *file, struct page *page,
        return 0;
 }
 
-struct address_space_operations cifs_addr_ops = {
+const struct address_space_operations cifs_addr_ops = {
        .readpage = cifs_readpage,
        .readpages = cifs_readpages,
        .writepage = cifs_writepage,
@@ -1959,7 +1957,7 @@ struct address_space_operations cifs_addr_ops = {
  * contain the header plus one complete page of data.  Otherwise, we need
  * to leave cifs_readpages out of the address space operations.
  */
-struct address_space_operations cifs_addr_ops_smallbuf = {
+const struct address_space_operations cifs_addr_ops_smallbuf = {
        .readpage = cifs_readpage,
        .writepage = cifs_writepage,
        .writepages = cifs_writepages,