Merge branch 'master' of github.com:oscarlab/betrfs

filesystem/ftfs_profile.c

@@ -1,3 +1,6 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
+
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
@@ -9,11 +12,11 @@ static struct proc_dir_entry * ftfs_profile_entry;
 
 static void ftfs_print_unlink_profile(void)
 {
-	printk("===== unlink =====\n");	
+	printk("===== unlink =====\n");
 	printk("time of if branch:%lld\n", unlink_stat.stage1_if.tv64);
 	printk("time of else branch:%lld\n", unlink_stat.stage1_else.tv64);
 	printk("time of stage2:%lld\n", unlink_stat.stage2.tv64);
-	printk("time of ftfs_unlink:%lld\n", unlink_stat.stage2.tv64 + 
+	printk("time of ftfs_unlink:%lld\n", unlink_stat.stage2.tv64 +
 					     unlink_stat.stage1_else.tv64 +
 					     unlink_stat.stage1_if.tv64);
 	printk("time of ftfs_rmdir:%lld\n", unlink_stat.rmdir.tv64);
@@ -24,7 +27,7 @@ static void ftfs_print_unlink_profile(void)
 	printk("count of ftfs_rmdir:%u\n", unlink_stat.count_rmdir);
 	printk("count of ftfs_destroy_inode:%u\n", unlink_stat.count_destroy);
 	printk("count of ftfs_evict_inode:%u\n", unlink_stat.count_evict);
-	printk("===== end ======\n");	
+	printk("===== end ======\n");
 	memset(&unlink_stat, 0, sizeof(unlink_stat));
 }
 

filesystem/ftfs_profile.h

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef FTFS_PROFILE_H
 #define FTFS_PROFILE_H
 

filesystem/toku_checkpoint.c

@@ -1,3 +1,6 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
+
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/slab.h>

filesystem/toku_checkpoint.h

@@ -1,3 +1,6 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
+
 #ifndef TOKU_CHECKPOINT_H
 #define TOKU_CHECKPOINT_H
 

filesystem/toku_engine_status.c

@@ -1,3 +1,6 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
+
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/slab.h>

filesystem/toku_engine_status.h

@@ -1,3 +1,6 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
+
 #ifndef TOKU_ENGINE_STATUS_H
 #define TOKU_ENGINE_STATUS_H
 

filesystem/toku_flusher.c

@@ -1,3 +1,6 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
+
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/slab.h>

filesystem/toku_flusher.h

@@ -1,3 +1,6 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
+
 #ifndef TOKU_FLUSHER_H
 #define TOKU_FLUSHER_H
 

filesystem/toku_memleak_detect.c

@@ -1,3 +1,6 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
+
 #ifdef TOKU_MEMLEAK_DETECT
 #include <linux/types.h>
 #include <linux/fs.h>

filesystem/toku_memleak_detect.h

@@ -1,3 +1,6 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
+
 #ifndef TOKU_MEMLEAK_DETECT_H
 #define TOKU_MEMLEAK_DETECT_H
 

ftfs/ftfs_dir.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include <linux/kernel.h>
 #include <linux/syscalls.h>
 #include <linux/bug.h>

ftfs/ftfs_dir.h

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef _FTFS_DIR_H
 #define _FTFS_DIR_H
 

ftfs/ftfs_error.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/timer.h>

ftfs/ftfs_error.h

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef _FTFS_ERROR_H
 #define _FTFS_ERROR_H
 

ftfs/ftfs_frwlock.c

@@ -1,9 +1,11 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include "ftfs_frwlock.h"
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/export.h>
-#include <linux/rwsem.h> 
+#include <linux/rwsem.h>
 #include <linux/atomic.h>
 
 void __sched ftfs_down_read(struct rw_semaphore *sem)

ftfs/ftfs_frwlock.h

@@ -1,7 +1,9 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef FTFS_FRWLOCK_H
 #define FTFS_FRWLOCK_H
 #include "ftfs_rwsem.h"
-#include <linux/linkage.h> 
+#include <linux/linkage.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/list.h>

ftfs/ftfs_fs.h

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef _FTFS_FS_H
 #define _FTFS_FS_H
 #define FTFS_SUPER_MAGIC 0

ftfs/ftfs_rwsem.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 //copied from 3.8 kernel
 
 /* rwsem.c: R/W semaphores: contention handling functions

ftfs/ftfs_rwsem.h

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 /*as values and the counter type limits the number of
  * potential readers/writers to 32767 for 32 bits and 2147483647
  * for 64 bits.
@@ -39,7 +41,7 @@ static inline int __ftfs_down_read_trylock(struct rw_semaphore *sem)
                     return 1;
 		}
 	}
-	return 0;	
+	return 0;
 
 }
 
@@ -50,7 +52,7 @@ static inline void __ftfs_down_write_nested(struct rw_semaphore *sem, int subcla
 {
 
 
-        long tmp; 
+        long tmp;
       tmp = atomic_long_add_return(FTFS_RWSEM_ACTIVE_WRITE_BIAS,
                                       (atomic_long_t *)&sem->count);
       if (unlikely(tmp != FTFS_RWSEM_ACTIVE_WRITE_BIAS))
@@ -82,7 +84,7 @@ static inline void __ftfs_up_read(struct rw_semaphore *sem)
 	long tmp;
  	tmp = atomic_long_dec_return((atomic_long_t *)&sem->count);
  	if (unlikely(tmp < -1 && (tmp & FTFS_RWSEM_ACTIVE_MASK) == 0))
- 	            ftfs_rwsem_wake(sem);	
+ 	            ftfs_rwsem_wake(sem);
 }
 
 /*

ftfs/ftfs_southbound.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include <linux/kallsyms.h>
 #include <linux/slab.h>
 #include <asm/page_types.h>
@@ -261,7 +263,7 @@ void detach_ftfs_southbound(struct task_struct *tsk)
 	ftfs_exit_fs(tsk);
 }
 
-void save_task_southbound(struct task_struct *tsk, 
+void save_task_southbound(struct task_struct *tsk,
 			struct ftfs_southbound *save)
 {
 	struct fs_struct *fs;

ftfs/ftfs_southbound.h

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef _FTFS_SOUTHBOUND_H
 #define _FTFS_SOUTHBOUND_H
 
@@ -95,7 +97,7 @@ int ftfs_private_umount(void);
 
 int in_southbound_context(struct task_struct *tsk);
 
-void save_task_southbound(struct task_struct *tsk, 
+void save_task_southbound(struct task_struct *tsk,
 			struct ftfs_southbound *save);
 void restore_task_southbound(struct task_struct *tsk,
 			struct ftfs_southbound *saved);

ftfs/ftfs_stat.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include <linux/kernel.h>
 #include <linux/time.h>
 #include <linux/err.h>

ftfs/ftfs_stat.h

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef _FTFS_STAT_H
 #define _FTFS_STAT_H
 #include<linux/statfs.h>

ftfs/ftfs_toku_lock.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include <linux/slab.h>
 #include <asm/uaccess.h>
 #include "ftfs_toku_lock.h"

ftfs/ftfs_toku_lock.h

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef _FTFS_ERROR_H
 #define _FTFS_ERROR_H
 

ftfs/toku_linkage.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/time.h>

ftfs/toku_zlib.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include <linux/zlib.h>
 #include <linux/vmalloc.h>
 #include "ftfs.h"
@@ -17,7 +19,7 @@ int deflateInit2_(z_streamp strm, int level, int method,
 		  int windowBits, int memLevel, int strategy) {
     vfree(strm->workspace);
     init_stream_workspace(strm);
-	return zlib_deflateInit2(strm, level,  method, 
+	return zlib_deflateInit2(strm, level,  method,
                     windowBits, memLevel, strategy);
 }
 

ftfs_fs/faked_std.h

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef FAKED_STD_LIB
 #define FAKED_STD_LIB
 

ftfs_fs/ftfs.h

@@ -1,7 +1,9 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef _FTFS_H
 #define _FTFS_H
 
-#  define FTFS_DEBUG_ON(err) 
+#  define FTFS_DEBUG_ON(err)
 static inline void ftfs_error (const char * function, const char * fmt, ...) {}
 static inline void ftfs_log (const char * function, const char * fmt, ...) {}
 

ftfs_fs/ftfs_bstore.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include <linux/kernel.h>
 #include <linux/slab.h>
 
@@ -189,7 +191,7 @@ int ftfs_bstore_update_ino(struct ftfs_sb_info *sbi, ino_t ino)
 	dbt_init(&next_ino_value_dbt, &curr_ino,
 	         sizeof(curr_ino));
 
-	TXN_GOTO_LABEL(retry); 
+	TXN_GOTO_LABEL(retry);
 	{
 
 		ftfs_bstore_txn_begin(sbi->db_env, NULL, &txn, TXN_MAY_WRITE);

ftfs_fs/ftfs_fs.h

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef FTFS_FS_H
 #define FTFS_FS_H
 

ftfs_fs/ftfs_metadata.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include <linux/sched.h>
 #include <linux/cred.h>
 #include <linux/slab.h>

ftfs_fs/ftfs_module.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include <linux/module.h>
 #include "ftfs_fs.h"
 

ftfs_fs/ftfs_southbound.h

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef _FTFS_SOUTHBOUND_H
 #define _FTFS_SOUTHBOUND_H
 
@@ -16,7 +18,7 @@ extern size_t db_cachesize;
 static inline int ftfs_super_statfs(struct dentry * d, struct kstatfs * buf)
 { return 0; }
 static inline int attach_ftfs_southbound(struct task_struct *tsk) { return 0; }
-static inline void save_task_southbound(struct task_struct *tsk, 
+static inline void save_task_southbound(struct task_struct *tsk,
 					struct ftfs_southbound *save) { }
 static inline void restore_task_southbound(struct task_struct *tsk,
 			struct ftfs_southbound *saved) { }

ftfs_fs/ftfs_super.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #include <linux/kernel.h>
 #include <linux/namei.h>
 #include <linux/slab.h>
@@ -147,7 +149,7 @@ ftfs_setup_inode(struct super_block *sb, struct ftfs_meta_key *meta_key,
                  struct ftfs_metadata *meta);
 
 static inline void
-ftfs_setup_metadata(struct ftfs_metadata *meta, umode_t mode, 
+ftfs_setup_metadata(struct ftfs_metadata *meta, umode_t mode,
                     loff_t size, dev_t rdev, ino_t ino)
 {
 	struct timespec now_tspec;
@@ -334,7 +336,7 @@ ftfs_do_unlink(struct ftfs_meta_key *meta_key, DB_TXN *txn,
  * we lock the whole subtree before rename for exclusive access. for
  * either success or fail, you have to call unlock or else you are
  * hosed
- * 
+ *
  * only the children are locked not the parent
  */
 static int prelock_children_for_rename(struct dentry *object, struct list_head *locked)

ftfs_fs/rbtreekv.c

@@ -1,3 +1,5 @@
+/* -*- mode: C++; c-basic-offset: 8; indent-tabs-mode: t -*- */
+// vim: set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab:
 #ifndef RBTREE_KV_H
 #define RBTREE_KV_H
 
@@ -191,7 +193,7 @@ static int rb_kv_insert(DB *db, struct rb_kv_node *node)
 			new = &((*new)->rb_left);
 		else if (result > 0)
 			new = &((*new)->rb_right);
-		else 
+		else
 			return -1;
 	}
 
@@ -363,7 +365,7 @@ static int dbc_c_set_bounds(DBC *dbc, const DBT *left_key, const DBT *right_key,
 	ret = dbt_alloc_and_copy(&wrap->right, right_key);
 	BUG_ON(ret != 0);
 
-	return 0; 
+	return 0;
 }
 
 static int dbc_c_getf_current(DBC *c, uint32_t flag, YDB_CALLBACK_FUNCTION f, void *extra)