Merge branch 'master' into gfs2

3 files changed, 2 insertions, 7 deletions

diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index a1ed657c3c84..2c122ee83adb 100644
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -89,8 +89,7 @@ static int init_inodecache(void)
 
 static void destroy_inodecache(void)
 {
-        if (kmem_cache_destroy(smb_inode_cachep))
-                printk(KERN_INFO "smb_inode_cache: not all structures were freed\n");
+        kmem_cache_destroy(smb_inode_cachep);
 }
 
 static int smb_remount(struct super_block *sb, int *flags, char *data)
@@ -167,7 +166,6 @@ smb_get_inode_attr(struct inode *inode, struct smb_fattr *fattr)
         fattr->f_mtime  = inode->i_mtime;
         fattr->f_ctime  = inode->i_ctime;
         fattr->f_atime  = inode->i_atime;
-        fattr->f_blksize= inode->i_blksize;
         fattr->f_blocks = inode->i_blocks;
 
         fattr->attr     = SMB_I(inode)->attr;
@@ -201,7 +199,6 @@ smb_set_inode_attr(struct inode *inode, struct smb_fattr *fattr)
         inode->i_uid    = fattr->f_uid;
         inode->i_gid    = fattr->f_gid;
         inode->i_ctime  = fattr->f_ctime;
-        inode->i_blksize= fattr->f_blksize;
         inode->i_blocks = fattr->f_blocks;
         inode->i_size   = fattr->f_size;
         inode->i_mtime  = fattr->f_mtime;
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
index c3495059889d..40e174db9872 100644
--- a/fs/smbfs/proc.c
+++ b/fs/smbfs/proc.c
@@ -1826,7 +1826,6 @@ smb_init_dirent(struct smb_sb_info *server, struct smb_fattr *fattr)
         fattr->f_nlink = 1;
         fattr->f_uid = server->mnt->uid;
         fattr->f_gid = server->mnt->gid;
-        fattr->f_blksize = SMB_ST_BLKSIZE;
         fattr->f_unix = 0;
 }
 
diff --git a/fs/smbfs/request.c b/fs/smbfs/request.c
index c8e96195b96e..0fb74697abc4 100644
--- a/fs/smbfs/request.c
+++ b/fs/smbfs/request.c
@@ -49,8 +49,7 @@ int smb_init_request_cache(void)
 
 void smb_destroy_request_cache(void)
 {
-        if (kmem_cache_destroy(req_cachep))
-                printk(KERN_INFO "smb_destroy_request_cache: not all structures were freed\n");
+        kmem_cache_destroy(req_cachep);
 }
 
 /*