Merge branch 'master' into gfs2

1 files changed, 2 insertions, 8 deletions

diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index f9edcd2ff3c8..31a3cb617ce0 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -269,14 +269,8 @@ fill_post_wcc(struct svc_fh *fhp)
         fhp->fh_post_uid        = inode->i_uid;
         fhp->fh_post_gid        = inode->i_gid;
         fhp->fh_post_size       = inode->i_size;
-        if (inode->i_blksize) {
-                fhp->fh_post_blksize    = inode->i_blksize;
-                fhp->fh_post_blocks     = inode->i_blocks;
-        } else {
-                fhp->fh_post_blksize    = BLOCK_SIZE;
-                /* how much do we care for accuracy with MinixFS? */
-                fhp->fh_post_blocks     = (inode->i_size+511) >> 9;
-        }
+        fhp->fh_post_blksize    = BLOCK_SIZE;
+        fhp->fh_post_blocks     = inode->i_blocks;
         fhp->fh_post_rdev[0]    = htonl((u32)imajor(inode));
         fhp->fh_post_rdev[1]    = htonl((u32)iminor(inode));
         fhp->fh_post_atime      = inode->i_atime;