Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d808efb4 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by Artem Bityutskiy
Browse files

UBIFS: amend debugging inode size check function prototype 



Add 'const struct ubifs_info *c' parameter to 'dbg_check_synced_i_size()'
function because we'll need it in the next patch when we switch to debugfs.
So this patch is just a preparation.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent bb2615d4

fs/ubifs/debug.c

+2 −1
Original line number Diff line number Diff line
@@ -1132,6 +1132,7 @@ int dbg_check_space_info(struct ubifs_info *c) 


/**

 * dbg_check_synced_i_size - check synchronized inode size.

 * @c: UBIFS file-system description object

 * @inode: inode to check

 *

 * If inode is clean, synchronized inode size has to be equivalent to current
@@ -1139,7 +1140,7 @@ int dbg_check_space_info(struct ubifs_info *c) 
 * has to be locked). Returns %0 if synchronized inode size if correct, and

 * %-EINVAL if not.

 */

int dbg_check_synced_i_size(struct inode *inode)

int dbg_check_synced_i_size(const struct ubifs_info *c, struct inode *inode)

{

	int err = 0;

	struct ubifs_inode *ui = ubifs_inode(inode);

fs/ubifs/debug.h

+4 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ int dbg_check_cats(struct ubifs_info *c); 
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_synced_i_size(const struct ubifs_info *c, struct inode *inode);

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);
@@ -416,7 +416,9 @@ static inline int dbg_check_ltab(struct ubifs_info *c) { return 0; } 
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_synced_i_size(const struct ubifs_info *c,

			struct inode *inode)                      { return 0; }

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; }

fs/ubifs/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir, 
	ubifs_assert(mutex_is_locked(&dir->i_mutex));

	ubifs_assert(mutex_is_locked(&inode->i_mutex));



	err = dbg_check_synced_i_size(inode);

	err = dbg_check_synced_i_size(c, inode);

	if (err)

		return err;
@@ -579,7 +579,7 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry) 
		inode->i_nlink, dir->i_ino);

	ubifs_assert(mutex_is_locked(&dir->i_mutex));

	ubifs_assert(mutex_is_locked(&inode->i_mutex));

	err = dbg_check_synced_i_size(inode);

	err = dbg_check_synced_i_size(c, inode);

	if (err)

		return err;

fs/ubifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1263,7 +1263,7 @@ int ubifs_setattr(struct dentry *dentry, struct iattr *attr) 
	if (err)

		return err;



	err = dbg_check_synced_i_size(inode);

	err = dbg_check_synced_i_size(c, inode);

	if (err)

		return err;