8 files changed, 40 insertions, 70 deletions

diff --git a/fs/cifs/README b/fs/cifs/README
index 5f0e1bd64fee..432e515431c4 100644
--- a/fs/cifs/README
+++ b/fs/cifs/README
@@ -269,7 +269,7 @@ A partial list of the supported mount options follows:
                 (gid) mount option is specified.  For the uid (gid) of newly
                 created files and directories, ie files created since 
                 the last mount of the server share, the expected uid 
-                (gid) is cached as as long as the inode remains in 
+                (gid) is cached as long as the inode remains in 
                 memory on the client.   Also note that permission
                 checks (authorization checks) on accesses to a file occur
                 at the server, but there are cases in which an administrator
@@ -375,7 +375,7 @@ A partial list of the supported mount options follows:
                 the local process on newly created files, directories, and
                 devices (create, mkdir, mknod).  If the CIFS Unix Extensions
                 are not negotiated, for newly created files and directories
-                instead of using the default uid and gid specified on the
+                instead of using the default uid and gid specified on
                 the mount, cache the new file's uid and gid locally which means
                 that the uid for the file can change when the inode is
                 reloaded (or the user remounts the share).
@@ -440,7 +440,7 @@ A partial list of the supported mount options follows:
                 create device files and fifos in a format compatible with
                 Services for Unix (SFU).  In addition retrieve bits 10-12
                 of the mode via the SETFILEBITS extended attribute (as
-                SFU does).  In the future the bottom 9 bits of the mode
+                SFU does).  In the future the bottom 9 bits of the
                 mode also will be emulated using queries of the security
                 descriptor (ACL).
  sign           Must use packet signing (helps avoid unwanted data modification
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 43364361276e..84976cdbe713 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -256,7 +256,6 @@ cifs_alloc_inode(struct super_block *sb)
         file data or metadata */
         cifs_inode->clientCanCacheRead = FALSE;
         cifs_inode->clientCanCacheAll = FALSE;
-        cifs_inode->vfs_inode.i_blksize = CIFS_MAX_MSGSIZE;
         cifs_inode->vfs_inode.i_blkbits = 14;  /* 2**14 = CIFS_MAX_MSGSIZE */
         cifs_inode->vfs_inode.i_flags = S_NOATIME | S_NOCMTIME;
         INIT_LIST_HEAD(&cifs_inode->openFileList);
@@ -495,25 +494,13 @@ cifs_get_sb(struct file_system_type *fs_type,
         return simple_set_mnt(mnt, sb);
 }
 
-static ssize_t cifs_file_writev(struct file *file, const struct iovec *iov,
-                                unsigned long nr_segs, loff_t *ppos)
-{
-        struct inode *inode = file->f_dentry->d_inode;
-        ssize_t written;
-
-        written = generic_file_writev(file, iov, nr_segs, ppos);
-        if (!CIFS_I(inode)->clientCanCacheAll)
-                filemap_fdatawrite(inode->i_mapping);
-        return written;
-}
-
-static ssize_t cifs_file_aio_write(struct kiocb *iocb, const char __user *buf,
-                                   size_t count, loff_t pos)
+static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
+                                   unsigned long nr_segs, loff_t pos)
 {
         struct inode *inode = iocb->ki_filp->f_dentry->d_inode;
         ssize_t written;
 
-        written = generic_file_aio_write(iocb, buf, count, pos);
+        written = generic_file_aio_write(iocb, iov, nr_segs, pos);
         if (!CIFS_I(inode)->clientCanCacheAll)
                 filemap_fdatawrite(inode->i_mapping);
         return written;
@@ -592,8 +579,6 @@ struct inode_operations cifs_symlink_inode_ops = {
 const struct file_operations cifs_file_ops = {
         .read = do_sync_read,
         .write = do_sync_write,
-        .readv = generic_file_readv,
-        .writev = cifs_file_writev,
         .aio_read = generic_file_aio_read,
         .aio_write = cifs_file_aio_write,
         .open = cifs_open,
@@ -635,8 +620,6 @@ const struct file_operations cifs_file_direct_ops = {
 const struct file_operations cifs_file_nobrl_ops = {
         .read = do_sync_read,
         .write = do_sync_write,
-        .readv = generic_file_readv,
-        .writev = cifs_file_writev,
         .aio_read = generic_file_aio_read,
         .aio_write = cifs_file_aio_write,
         .open = cifs_open,
@@ -713,8 +696,7 @@ cifs_init_inodecache(void)
 static void
 cifs_destroy_inodecache(void)
 {
-        if (kmem_cache_destroy(cifs_inode_cachep))
-                printk(KERN_WARNING "cifs_inode_cache: error freeing\n");
+        kmem_cache_destroy(cifs_inode_cachep);
 }
 
 static int
@@ -792,13 +774,9 @@ static void
 cifs_destroy_request_bufs(void)
 {
         mempool_destroy(cifs_req_poolp);
-        if (kmem_cache_destroy(cifs_req_cachep))
-                printk(KERN_WARNING
-                       "cifs_destroy_request_cache: error not all structures were freed\n");
+        kmem_cache_destroy(cifs_req_cachep);
         mempool_destroy(cifs_sm_req_poolp);
-        if (kmem_cache_destroy(cifs_sm_req_cachep))
-                printk(KERN_WARNING
-                      "cifs_destroy_request_cache: cifs_small_rq free error\n");
+        kmem_cache_destroy(cifs_sm_req_cachep);
 }
 
 static int
@@ -833,13 +811,8 @@ static void
 cifs_destroy_mids(void)
 {
         mempool_destroy(cifs_mid_poolp);
-        if (kmem_cache_destroy(cifs_mid_cachep))
-                printk(KERN_WARNING
-                       "cifs_destroy_mids: error not all structures were freed\n");
-
-        if (kmem_cache_destroy(cifs_oplock_cachep))
-                printk(KERN_WARNING
-                       "error not all oplock structures were freed\n");
+        kmem_cache_destroy(cifs_mid_cachep);
+        kmem_cache_destroy(cifs_oplock_cachep);
 }
 
 static int cifs_oplock_thread(void * dummyarg)
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 1d17691086c2..4093d5332930 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -771,16 +771,17 @@ cifs_parse_mount_options(char *options, const char *devname,struct smb_vol *vol)
         separator[0] = ',';
         separator[1] = 0; 
 
-        if(Local_System_Name[0] != 0)
+        if (Local_System_Name[0] != 0)
                 memcpy(vol->source_rfc1001_name, Local_System_Name,15);
         else {
+                char *nodename = utsname()->nodename;
+                int n = strnlen(nodename,15);
                 memset(vol->source_rfc1001_name,0x20,15);
-                for(i=0;i < strnlen(system_utsname.nodename,15);i++) {
+                for(i=0 ; i < n ; i++) {
                         /* does not have to be perfect mapping since field is
                         informational, only used for servers that do not support
                         port 445 and it can be overridden at mount time */
-                        vol->source_rfc1001_name[i] = 
-                                toupper(system_utsname.nodename[i]);
+                        vol->source_rfc1001_name[i] = toupper(nodename[i]);
                 }
         }
         vol->source_rfc1001_name[15] = 0;
@@ -2157,7 +2158,7 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,
                                   32, nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bytes_returned =
-                    cifs_strtoUCS((__le16 *) bcc_ptr, system_utsname.release,
+                    cifs_strtoUCS((__le16 *) bcc_ptr, utsname()->release,
                                   32, nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bcc_ptr += 2;
@@ -2184,8 +2185,8 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,
                 }
                 strcpy(bcc_ptr, "Linux version ");
                 bcc_ptr += strlen("Linux version ");
-                strcpy(bcc_ptr, system_utsname.release);
-                bcc_ptr += strlen(system_utsname.release) + 1;
+                strcpy(bcc_ptr, utsname()->release);
+                bcc_ptr += strlen(utsname()->release) + 1;
                 strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);
                 bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1;
         }
@@ -2449,7 +2450,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
                                   32, nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bytes_returned =
-                    cifs_strtoUCS((__le16 *) bcc_ptr, system_utsname.release, 32,
+                    cifs_strtoUCS((__le16 *) bcc_ptr, utsname()->release, 32,
                                   nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bcc_ptr += 2;   /* null terminate Linux version */
@@ -2466,8 +2467,8 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
         } else {                /* ASCII */
                 strcpy(bcc_ptr, "Linux version ");
                 bcc_ptr += strlen("Linux version ");
-                strcpy(bcc_ptr, system_utsname.release);
-                bcc_ptr += strlen(system_utsname.release) + 1;
+                strcpy(bcc_ptr, utsname()->release);
+                bcc_ptr += strlen(utsname()->release) + 1;
                 strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);
                 bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1;
                 bcc_ptr++;      /* empty domain field */
@@ -2840,7 +2841,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
                                   32, nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bytes_returned =
-                    cifs_strtoUCS((__le16 *) bcc_ptr, system_utsname.release, 32,
+                    cifs_strtoUCS((__le16 *) bcc_ptr, utsname()->release, 32,
                                   nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bcc_ptr += 2;   /* null term version string */
@@ -2892,8 +2893,8 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
 
                 strcpy(bcc_ptr, "Linux version ");
                 bcc_ptr += strlen("Linux version ");
-                strcpy(bcc_ptr, system_utsname.release);
-                bcc_ptr += strlen(system_utsname.release) + 1;
+                strcpy(bcc_ptr, utsname()->release);
+                bcc_ptr += strlen(utsname()->release) + 1;
                 strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);
                 bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1;
                 bcc_ptr++;      /* null domain */
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index ddb012a68023..976a691c5a68 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -25,7 +25,6 @@
 #include <linux/backing-dev.h>
 #include <linux/stat.h>
 #include <linux/fcntl.h>
-#include <linux/mpage.h>
 #include <linux/pagemap.h>
 #include <linux/pagevec.h>
 #include <linux/smp_lock.h>
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index fe6d21f99964..35d54bb0869a 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -19,7 +19,6 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 #include <linux/fs.h>
-#include <linux/buffer_head.h>
 #include <linux/stat.h>
 #include <linux/pagemap.h>
 #include <asm/div64.h>
@@ -597,7 +596,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
 
         if (!rc) {
                 if (direntry->d_inode)
-                        direntry->d_inode->i_nlink--;
+                        drop_nlink(direntry->d_inode);
         } else if (rc == -ENOENT) {
                 d_drop(direntry);
         } else if (rc == -ETXTBSY) {
@@ -616,7 +615,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
                                                 CIFS_MOUNT_MAP_SPECIAL_CHR);
                         CIFSSMBClose(xid, pTcon, netfid);
                         if (direntry->d_inode)
-                                direntry->d_inode->i_nlink--;
+                                drop_nlink(direntry->d_inode);
                 }
         } else if (rc == -EACCES) {
                 /* try only if r/o attribute set in local lookup data? */
@@ -670,7 +669,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
                                                 CIFS_MOUNT_MAP_SPECIAL_CHR);
                         if (!rc) {
                                 if (direntry->d_inode)
-                                        direntry->d_inode->i_nlink--;
+                                        drop_nlink(direntry->d_inode);
                         } else if (rc == -ETXTBSY) {
                                 int oplock = FALSE;
                                 __u16 netfid;
@@ -691,7 +690,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
                                                     CIFS_MOUNT_MAP_SPECIAL_CHR);
                                         CIFSSMBClose(xid, pTcon, netfid);
                                         if (direntry->d_inode)
-                                                direntry->d_inode->i_nlink--;
+                                                drop_nlink(direntry->d_inode);
                                 }
                         /* BB if rc = -ETXTBUSY goto the rename logic BB */
                         }
@@ -742,7 +741,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
                 cFYI(1, ("cifs_mkdir returned 0x%x", rc));
                 d_drop(direntry);
         } else {
-                inode->i_nlink++;
+                inc_nlink(inode);
                 if (pTcon->ses->capabilities & CAP_UNIX)
                         rc = cifs_get_inode_info_unix(&newinode, full_path,
                                                       inode->i_sb,xid);
@@ -823,9 +822,9 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)
                           cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
 
         if (!rc) {
-                inode->i_nlink--;
+                drop_nlink(inode);
                 i_size_write(direntry->d_inode,0);
-                direntry->d_inode->i_nlink = 0;
+                clear_nlink(direntry->d_inode);
         }
 
         cifsInode = CIFS_I(direntry->d_inode);
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c
index b0ea6687ab55..e34c7db00f6f 100644
--- a/fs/cifs/ioctl.c
+++ b/fs/cifs/ioctl.c
@@ -22,7 +22,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
 #include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifsproto.h"
@@ -74,7 +73,7 @@ int cifs_ioctl (struct inode * inode, struct file * filep,
                         }
                         break;
 #ifdef CONFIG_CIFS_POSIX
-                case EXT2_IOC_GETFLAGS:
+                case FS_IOC_GETFLAGS:
                         if(CIFS_UNIX_EXTATTR_CAP & caps) {
                                 if (pSMBFile == NULL)
                                         break;
@@ -82,12 +81,12 @@ int cifs_ioctl (struct inode * inode, struct file * filep,
                                         &ExtAttrBits, &ExtAttrMask);
                                 if(rc == 0)
                                         rc = put_user(ExtAttrBits &
-                                                EXT2_FL_USER_VISIBLE,
+                                                FS_FL_USER_VISIBLE,
                                                 (int __user *)arg);
                         }
                         break;
 
-                case EXT2_IOC_SETFLAGS:
+                case FS_IOC_SETFLAGS:
                         if(CIFS_UNIX_EXTATTR_CAP & caps) {
                                 if(get_user(ExtAttrBits,(int __user *)arg)) {
                                         rc = -EFAULT;
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index acbabc09543f..b5b0a2a41bef 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -234,10 +234,9 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
 
         if (allocation_size < end_of_file)
                 cFYI(1, ("May be sparse file, allocation less than file size"));
-        cFYI(1, ("File Size %ld and blocks %llu and blocksize %ld",
+        cFYI(1, ("File Size %ld and blocks %llu",
                 (unsigned long)tmp_inode->i_size,
-                (unsigned long long)tmp_inode->i_blocks,
-                tmp_inode->i_blksize));
+                (unsigned long long)tmp_inode->i_blocks));
         if (S_ISREG(tmp_inode->i_mode)) {
                 cFYI(1, ("File inode"));
                 tmp_inode->i_op = &cifs_file_inode_ops;
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index e4c4e466e320..a8a083543ba0 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -111,7 +111,7 @@ static void unicode_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
         bytes_ret = cifs_strtoUCS((__le16 *)bcc_ptr, "Linux version ", 32,
                                   nls_cp);
         bcc_ptr += 2 * bytes_ret;
-        bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, system_utsname.release,
+        bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, init_utsname()->release,
                                   32, nls_cp);
         bcc_ptr += 2 * bytes_ret;
         bcc_ptr += 2; /* trailing null */
@@ -158,8 +158,8 @@ static void ascii_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
 
         strcpy(bcc_ptr, "Linux version ");
         bcc_ptr += strlen("Linux version ");
-        strcpy(bcc_ptr, system_utsname.release);
-        bcc_ptr += strlen(system_utsname.release) + 1;
+        strcpy(bcc_ptr, init_utsname()->release);
+        bcc_ptr += strlen(init_utsname()->release) + 1;
 
         strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);
         bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1;