Btrfs: Handle SGID bit when creating inodes

[karo-tx-linux.git] / fs / btrfs / file.c

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 0e3a13a4565355b2ca975ed5b68a6c0f48ae3fc1..3e8023efaff7581568f8d9a4f131a01c37f76d3b 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -29,7 +29,6 @@
 #include <linux/writeback.h>
 #include <linux/statfs.h>
 #include <linux/compat.h>
-#include <linux/version.h>
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
@@ -556,10 +555,6 @@ next_slot:
                                        inode_sub_bytes(inode, old_num -
                                                        new_num);
                                }
-                               if (!compression && !encryption) {
-                                       btrfs_set_file_extent_ram_bytes(leaf,
-                                                       extent, new_num);
-                               }
                                btrfs_set_file_extent_num_bytes(leaf,
                                                        extent, new_num);
                                btrfs_mark_buffer_dirty(leaf);
@@ -1219,10 +1214,10 @@ int btrfs_sync_file(struct file *file, struct dentry *dentry, int datasync)
        }
        mutex_unlock(&root->fs_info->trans_mutex);
 
-       root->fs_info->tree_log_batch++;
+       root->log_batch++;
        filemap_fdatawrite(inode->i_mapping);
        btrfs_wait_ordered_range(inode, 0, (u64)-1);
-       root->fs_info->tree_log_batch++;
+       root->log_batch++;
 
        /*
         * ok we haven't committed the transaction yet, lets do a commit