RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-05-06 09:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: check: Move __create_inode_item function to check/common.c

Browse Source 
Move __create_inode_item() function to check/common.c and rename it to
insert_inode_item(), with comment added.

Reviewed-by: Su Yue <suy.fnst@cn.fujitsu.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Qu Wenruo 2018-01-18 16:03:09 +08:00 committed by David Sterba
parent b695ef1ddc
commit a20557599e
3 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
check/common.c
View File

@ -14,8 +14,11 @@
* Boston, MA 021110-1307, USA. * Boston, MA 021110-1307, USA.
*/ */
#include <time.h>
#include "ctree.h" #include "ctree.h"
#include "internal.h" #include "internal.h"
#include "messages.h"
#include "transaction.h"
#include "check/common.h" #include "check/common.h"
/* /*
@ -99,3 +102,45 @@ out:
return 0; return 0;
} }
/*
* Wrapper to insert one inode item into given @root
* Timestamp will be set to current time.
*
* @root: the root to insert inode item into
* @ino: inode number
* @size: inode size
* @nbytes: nbytes (real used size, without hole)
* @nlink: number of links
* @mode: file mode, including S_IF* bits
*/
int insert_inode_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 ino, u64 size,
u64 nbytes, u64 nlink, u32 mode)
{
struct btrfs_inode_item ii;
time_t now = time(NULL);
int ret;
btrfs_set_stack_inode_size(&ii, size);
btrfs_set_stack_inode_nbytes(&ii, nbytes);
btrfs_set_stack_inode_nlink(&ii, nlink);
btrfs_set_stack_inode_mode(&ii, mode);
btrfs_set_stack_inode_generation(&ii, trans->transid);
btrfs_set_stack_timespec_nsec(&ii.atime, 0);
btrfs_set_stack_timespec_sec(&ii.ctime, now);
btrfs_set_stack_timespec_nsec(&ii.ctime, 0);
btrfs_set_stack_timespec_sec(&ii.mtime, now);
btrfs_set_stack_timespec_nsec(&ii.mtime, 0);
btrfs_set_stack_timespec_sec(&ii.otime, 0);
btrfs_set_stack_timespec_nsec(&ii.otime, 0);
ret = btrfs_insert_inode(trans, root, ino, &ii);
ASSERT(!ret);
warning("root %llu inode %llu recreating inode item, this may "
"be incomplete, please check permissions and content after "
"the fsck completes.\n", (unsigned long long)root->objectid,
(unsigned long long)ino);
return 0;
}

3
check/common.h
View File

@ -82,5 +82,8 @@ static inline int fs_root_objectid(u64 objectid)
int count_csum_range(struct btrfs_fs_info *fs_info, u64 start, int count_csum_range(struct btrfs_fs_info *fs_info, u64 start,
u64 len, u64 *found); u64 len, u64 *found);
int insert_inode_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 ino, u64 size,
u64 nbytes, u64 nlink, u32 mode);
#endif #endif

36
check/main.c
View File

@ -2691,45 +2691,13 @@ static int delete_dir_index(struct btrfs_root *root,
return ret; return ret;
} }
static int __create_inode_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 ino, u64 size,
u64 nbytes, u64 nlink, u32 mode)
{
struct btrfs_inode_item ii;
time_t now = time(NULL);
int ret;
btrfs_set_stack_inode_size(&ii, size);
btrfs_set_stack_inode_nbytes(&ii, nbytes);
btrfs_set_stack_inode_nlink(&ii, nlink);
btrfs_set_stack_inode_mode(&ii, mode);
btrfs_set_stack_inode_generation(&ii, trans->transid);
btrfs_set_stack_timespec_nsec(&ii.atime, 0);
btrfs_set_stack_timespec_sec(&ii.ctime, now);
btrfs_set_stack_timespec_nsec(&ii.ctime, 0);
btrfs_set_stack_timespec_sec(&ii.mtime, now);
btrfs_set_stack_timespec_nsec(&ii.mtime, 0);
btrfs_set_stack_timespec_sec(&ii.otime, 0);
btrfs_set_stack_timespec_nsec(&ii.otime, 0);
ret = btrfs_insert_inode(trans, root, ino, &ii);
ASSERT(!ret);
warning("root %llu inode %llu recreating inode item, this may "
"be incomplete, please check permissions and content after "
"the fsck completes.\n", (unsigned long long)root->objectid,
(unsigned long long)ino);
return 0;
}
static int create_inode_item_lowmem(struct btrfs_trans_handle *trans, static int create_inode_item_lowmem(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 ino, struct btrfs_root *root, u64 ino,
u8 filetype) u8 filetype)
{ {
u32 mode = (filetype == BTRFS_FT_DIR ? S_IFDIR : S_IFREG) | 0755; u32 mode = (filetype == BTRFS_FT_DIR ? S_IFDIR : S_IFREG) | 0755;
return __create_inode_item(trans, root, ino, 0, 0, 0, mode); return insert_inode_item(trans, root, ino, 0, 0, 0, mode);
} }
static int create_inode_item(struct btrfs_root *root, static int create_inode_item(struct btrfs_root *root,
@ -2762,7 +2730,7 @@ static int create_inode_item(struct btrfs_root *root,
mode = S_IFREG | 0755; mode = S_IFREG | 0755;
} }
ret = __create_inode_item(trans, root, rec->ino, size, rec->nbytes, ret = insert_inode_item(trans, root, rec->ino, size, rec->nbytes,
nlink, mode); nlink, mode);
btrfs_commit_transaction(trans, root); btrfs_commit_transaction(trans, root);
return 0; return 0;