projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ufs
/
cylinder.c
diff --git
a/fs/ufs/cylinder.c
b/fs/ufs/cylinder.c
index 65fe06810172bc06d16d2a79898dc0f6b74aec41..b4676322ddb65830d69b74a014c78668eb24a90f 100644
(file)
--- a/
fs/ufs/cylinder.c
+++ b/
fs/ufs/cylinder.c
@@
-9,7
+9,6
@@
*/
#include <linux/fs.h>
*/
#include <linux/fs.h>
-#include <linux/ufs_fs.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/string.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/string.h>
@@
-17,18
+16,11
@@
#include <asm/byteorder.h>
#include <asm/byteorder.h>
+#include "ufs_fs.h"
+#include "ufs.h"
#include "swab.h"
#include "util.h"
#include "swab.h"
#include "util.h"
-#undef UFS_CYLINDER_DEBUG
-
-#ifdef UFS_CYLINDER_DEBUG
-#define UFSD(x) printk("(%s, %d), %s:", __FILE__, __LINE__, __FUNCTION__); printk x;
-#else
-#define UFSD(x)
-#endif
-
-
/*
* Read cylinder group into cache. The memory space for ufs_cg_private_info
* structure is already allocated during ufs_read_super.
/*
* Read cylinder group into cache. The memory space for ufs_cg_private_info
* structure is already allocated during ufs_read_super.
@@
-42,7
+34,7
@@
static void ufs_read_cylinder (struct super_block * sb,
struct ufs_cylinder_group * ucg;
unsigned i, j;
struct ufs_cylinder_group * ucg;
unsigned i, j;
- UFSD(
("ENTER, cgno %u, bitmap_nr %u\n", cgno, bitmap_nr))
+ UFSD(
"ENTER, cgno %u, bitmap_nr %u\n", cgno, bitmap_nr);
uspi = sbi->s_uspi;
ucpi = sbi->s_ucpi[bitmap_nr];
ucg = (struct ufs_cylinder_group *)sbi->s_ucg[cgno]->b_data;
uspi = sbi->s_uspi;
ucpi = sbi->s_ucpi[bitmap_nr];
ucg = (struct ufs_cylinder_group *)sbi->s_ucg[cgno]->b_data;
@@
-73,7
+65,7
@@
static void ufs_read_cylinder (struct super_block * sb,
ucpi->c_clustersumoff = fs32_to_cpu(sb, ucg->cg_u.cg_44.cg_clustersumoff);
ucpi->c_clusteroff = fs32_to_cpu(sb, ucg->cg_u.cg_44.cg_clusteroff);
ucpi->c_nclusterblks = fs32_to_cpu(sb, ucg->cg_u.cg_44.cg_nclusterblks);
ucpi->c_clustersumoff = fs32_to_cpu(sb, ucg->cg_u.cg_44.cg_clustersumoff);
ucpi->c_clusteroff = fs32_to_cpu(sb, ucg->cg_u.cg_44.cg_clusteroff);
ucpi->c_nclusterblks = fs32_to_cpu(sb, ucg->cg_u.cg_44.cg_nclusterblks);
- UFSD(
("EXIT\n"))
+ UFSD(
"EXIT\n");
return;
failed:
return;
failed:
@@
-95,11
+87,11
@@
void ufs_put_cylinder (struct super_block * sb, unsigned bitmap_nr)
struct ufs_cylinder_group * ucg;
unsigned i;
struct ufs_cylinder_group * ucg;
unsigned i;
- UFSD(
("ENTER, bitmap_nr %u\n", bitmap_nr))
+ UFSD(
"ENTER, bitmap_nr %u\n", bitmap_nr);
uspi = sbi->s_uspi;
if (sbi->s_cgno[bitmap_nr] == UFS_CGNO_EMPTY) {
uspi = sbi->s_uspi;
if (sbi->s_cgno[bitmap_nr] == UFS_CGNO_EMPTY) {
- UFSD(
("EXIT\n"))
+ UFSD(
"EXIT\n");
return;
}
ucpi = sbi->s_ucpi[bitmap_nr];
return;
}
ucpi = sbi->s_ucpi[bitmap_nr];
@@
-122,7
+114,7
@@
void ufs_put_cylinder (struct super_block * sb, unsigned bitmap_nr)
}
sbi->s_cgno[bitmap_nr] = UFS_CGNO_EMPTY;
}
sbi->s_cgno[bitmap_nr] = UFS_CGNO_EMPTY;
- UFSD(
("EXIT\n"))
+ UFSD(
"EXIT\n");
}
/*
}
/*
@@
-139,7
+131,7
@@
struct ufs_cg_private_info * ufs_load_cylinder (
struct ufs_cg_private_info * ucpi;
unsigned cg, i, j;
struct ufs_cg_private_info * ucpi;
unsigned cg, i, j;
- UFSD(
("ENTER, cgno %u\n", cgno))
+ UFSD(
"ENTER, cgno %u\n", cgno);
uspi = sbi->s_uspi;
if (cgno >= uspi->s_ncg) {
uspi = sbi->s_uspi;
if (cgno >= uspi->s_ncg) {
@@
-150,7
+142,7
@@
struct ufs_cg_private_info * ufs_load_cylinder (
* Cylinder group number cg it in cache and it was last used
*/
if (sbi->s_cgno[0] == cgno) {
* Cylinder group number cg it in cache and it was last used
*/
if (sbi->s_cgno[0] == cgno) {
- UFSD(
("EXIT\n"))
+ UFSD(
"EXIT\n");
return sbi->s_ucpi[0];
}
/*
return sbi->s_ucpi[0];
}
/*
@@
-160,16
+152,16
@@
struct ufs_cg_private_info * ufs_load_cylinder (
if (sbi->s_cgno[cgno] != UFS_CGNO_EMPTY) {
if (sbi->s_cgno[cgno] != cgno) {
ufs_panic (sb, "ufs_load_cylinder", "internal error, wrong number of cg in cache");
if (sbi->s_cgno[cgno] != UFS_CGNO_EMPTY) {
if (sbi->s_cgno[cgno] != cgno) {
ufs_panic (sb, "ufs_load_cylinder", "internal error, wrong number of cg in cache");
- UFSD(
("EXIT (FAILED)\n"))
+ UFSD(
"EXIT (FAILED)\n");
return NULL;
}
else {
return NULL;
}
else {
- UFSD(
("EXIT\n"))
+ UFSD(
"EXIT\n");
return sbi->s_ucpi[cgno];
}
} else {
ufs_read_cylinder (sb, cgno, cgno);
return sbi->s_ucpi[cgno];
}
} else {
ufs_read_cylinder (sb, cgno, cgno);
- UFSD(
("EXIT\n"))
+ UFSD(
"EXIT\n");
return sbi->s_ucpi[cgno];
}
}
return sbi->s_ucpi[cgno];
}
}
@@
-204,6
+196,6
@@
struct ufs_cg_private_info * ufs_load_cylinder (
sbi->s_ucpi[0] = ucpi;
ufs_read_cylinder (sb, cgno, 0);
}
sbi->s_ucpi[0] = ucpi;
ufs_read_cylinder (sb, cgno, 0);
}
- UFSD(
("EXIT\n"))
+ UFSD(
"EXIT\n");
return sbi->s_ucpi[0];
}
return sbi->s_ucpi[0];
}