From 3cd190ad8045e9801c165d20d859ad28e8a92fb9 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Wed, 25 May 2011 17:38:29 +0300
Subject: [PATCH] --- yaml --- r: 255055 b: refs/heads/master c:
 1b51e98365e42c27eb2664f8353bc62ab8c55c85 h: refs/heads/master i:   255053:
 c2426edd9b540d85e186697303b3d3fb87e42e57   255051:
 33ef41253b2d7648071a620c25646b54a1616ae0   255047:
 cc40dfe1a5dd0b30b50feebf5ba854fda04e594e   255039:
 18884543122c9726bce47f29eebc9dc5a8fa28c2 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ubifs/debug.c | 2 +-
 trunk/fs/ubifs/debug.h | 4 ++--
 trunk/fs/ubifs/super.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7f98ff64fc61..a1b405fb9925 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4315fb4072905e45da94d51e2c1e86fa41c5fc5f
+refs/heads/master: 1b51e98365e42c27eb2664f8353bc62ab8c55c85
diff --git a/trunk/fs/ubifs/debug.c b/trunk/fs/ubifs/debug.c
index 4a2170dce0db..26d4c6173181 100644
--- a/trunk/fs/ubifs/debug.c
+++ b/trunk/fs/ubifs/debug.c
@@ -1177,7 +1177,7 @@ int dbg_check_synced_i_size(struct inode *inode)
  * Note, it is good idea to make sure the @dir->i_mutex is locked before
  * calling this function.
  */
-int dbg_check_dir_size(struct ubifs_info *c, const struct inode *dir)
+int dbg_check_dir(struct ubifs_info *c, const struct inode *dir)
 {
 	unsigned int nlink = 2;
 	union ubifs_key key;
diff --git a/trunk/fs/ubifs/debug.h b/trunk/fs/ubifs/debug.h
index c6ad9ea15e3c..a51c20be655d 100644
--- a/trunk/fs/ubifs/debug.h
+++ b/trunk/fs/ubifs/debug.h
@@ -248,7 +248,7 @@ int dbg_check_ltab(struct ubifs_info *c);
 int dbg_chk_lpt_free_spc(struct ubifs_info *c);
 int dbg_chk_lpt_sz(struct ubifs_info *c, int action, int len);
 int dbg_check_synced_i_size(struct inode *inode);
-int dbg_check_dir_size(struct ubifs_info *c, const struct inode *dir);
+int dbg_check_dir(struct ubifs_info *c, const struct inode *dir);
 int dbg_check_tnc(struct ubifs_info *c, int extra);
 int dbg_check_idx_size(struct ubifs_info *c, long long idx_size);
 int dbg_check_filesystem(struct ubifs_info *c);
@@ -417,7 +417,7 @@ static inline int dbg_chk_lpt_free_spc(struct ubifs_info *c)      { return 0; }
 static inline int dbg_chk_lpt_sz(struct ubifs_info *c,
 				 int action, int len)             { return 0; }
 static inline int dbg_check_synced_i_size(struct inode *inode)    { return 0; }
-static inline int dbg_check_dir_size(struct ubifs_info *c,
+static inline int dbg_check_dir(struct ubifs_info *c,
 				const struct inode *dir)          { return 0; }
 static inline int dbg_check_tnc(struct ubifs_info *c, int extra)  { return 0; }
 static inline int dbg_check_idx_size(struct ubifs_info *c,
diff --git a/trunk/fs/ubifs/super.c b/trunk/fs/ubifs/super.c
index 529be0582029..de82c5d04ab9 100644
--- a/trunk/fs/ubifs/super.c
+++ b/trunk/fs/ubifs/super.c
@@ -94,7 +94,7 @@ static int validate_inode(struct ubifs_info *c, const struct inode *inode)
 			   ubifs_compr_name(ui->compr_type));
 	}
 
-	err = dbg_check_dir_size(c, inode);
+	err = dbg_check_dir(c, inode);
 	return err;
 }