Merge branch 'master' into gfs2

1 files changed, 2 insertions, 7 deletions

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index e8c143d182c4..bc9376ca86cd 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -277,10 +277,8 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
                          * report the blocks in 512byte units
                          */
                         inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
-                        inode->i_blksize = inode->i_sb->s_blocksize;
                 } else {
                         inode->i_blocks = fattr->du.nfs2.blocks;
-                        inode->i_blksize = fattr->du.nfs2.blocksize;
                 }
                 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
                 nfsi->attrtimeo_timestamp = jiffies;
@@ -443,7 +441,7 @@ static struct nfs_open_context *alloc_nfs_open_context(struct vfsmount *mnt, str
 {
         struct nfs_open_context *ctx;
 
-        ctx = (struct nfs_open_context *)kmalloc(sizeof(*ctx), GFP_KERNEL);
+        ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
         if (ctx != NULL) {
                 atomic_set(&ctx->count, 1);
                 ctx->dentry = dget(dentry);
@@ -969,10 +967,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
                  * report the blocks in 512byte units
                  */
                 inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
-                inode->i_blksize = inode->i_sb->s_blocksize;
         } else {
                 inode->i_blocks = fattr->du.nfs2.blocks;
-                inode->i_blksize = fattr->du.nfs2.blocksize;
         }
 
         if ((fattr->valid & NFS_ATTR_FATTR_V4) != 0 &&
@@ -1134,8 +1130,7 @@ static int __init nfs_init_inodecache(void)
 
 static void nfs_destroy_inodecache(void)
 {
-        if (kmem_cache_destroy(nfs_inode_cachep))
-                printk(KERN_INFO "nfs_inode_cache: not all structures were freed\n");
+        kmem_cache_destroy(nfs_inode_cachep);
 }
 
 /*