1 files changed, 10 insertions, 1 deletions

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index df5ac048dc74..334e0b18a014 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -775,6 +775,8 @@ static int fuse_link(struct dentry *entry, struct inode *newdir,
 static void fuse_fillattr(struct inode *inode, struct fuse_attr *attr,
                           struct kstat *stat)
 {
+        unsigned int blkbits;
+
         stat->dev = inode->i_sb->s_dev;
         stat->ino = attr->ino;
         stat->mode = (inode->i_mode & S_IFMT) | (attr->mode & 07777);
@@ -790,7 +792,13 @@ static void fuse_fillattr(struct inode *inode, struct fuse_attr *attr,
         stat->ctime.tv_nsec = attr->ctimensec;
         stat->size = attr->size;
         stat->blocks = attr->blocks;
-        stat->blksize = (1 << inode->i_blkbits);
+
+        if (attr->blksize != 0)
+                blkbits = ilog2(attr->blksize);
+        else
+                blkbits = inode->i_sb->s_blocksize_bits;
+
+        stat->blksize = 1 << blkbits;
 }
 
 static int fuse_do_getattr(struct inode *inode, struct kstat *stat,
@@ -863,6 +871,7 @@ int fuse_update_attributes(struct inode *inode, struct kstat *stat,
                 if (stat) {
                         generic_fillattr(inode, stat);
                         stat->mode = fi->orig_i_mode;
+                        stat->ino = fi->orig_ino;
                 }
         }