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 tag 'mmc-v3.16-2' of git://git.linaro.org/people/ulf.hansson/mmc
[firefly-linux-kernel-4.4.55.git]
/
fs
/
hpfs
/
dnode.c
diff --git
a/fs/hpfs/dnode.c
b/fs/hpfs/dnode.c
index 4364b2a02c5dba48c121c7e642afc0a9c56cf9c1..f36fc010fccbf1ce82ca129272705e24432fcb2c 100644
(file)
--- a/
fs/hpfs/dnode.c
+++ b/
fs/hpfs/dnode.c
@@
-17,7
+17,7
@@
static loff_t get_pos(struct dnode *d, struct hpfs_dirent *fde)
if (de == fde) return ((loff_t) le32_to_cpu(d->self) << 4) | (loff_t)i;
i++;
}
if (de == fde) return ((loff_t) le32_to_cpu(d->self) << 4) | (loff_t)i;
i++;
}
- pr
intk("HPFS: get_pos: not_found\n"
);
+ pr
_info("%s(): not_found\n", __func__
);
return ((loff_t)le32_to_cpu(d->self) << 4) | (loff_t)1;
}
return ((loff_t)le32_to_cpu(d->self) << 4) | (loff_t)1;
}
@@
-32,7
+32,7
@@
void hpfs_add_pos(struct inode *inode, loff_t *pos)
if (hpfs_inode->i_rddir_off[i] == pos) return;
if (!(i&0x0f)) {
if (!(ppos = kmalloc((i+0x11) * sizeof(loff_t*), GFP_NOFS))) {
if (hpfs_inode->i_rddir_off[i] == pos) return;
if (!(i&0x0f)) {
if (!(ppos = kmalloc((i+0x11) * sizeof(loff_t*), GFP_NOFS))) {
- pr
intk("HPFS:
out of memory for position list\n");
+ pr
_err("
out of memory for position list\n");
return;
}
if (hpfs_inode->i_rddir_off) {
return;
}
if (hpfs_inode->i_rddir_off) {
@@
-63,7
+63,8
@@
void hpfs_del_pos(struct inode *inode, loff_t *pos)
}
return;
not_f:
}
return;
not_f:
- /*printk("HPFS: warning: position pointer %p->%08x not found\n", pos, (int)*pos);*/
+ /*pr_warn("position pointer %p->%08x not found\n",
+ pos, (int)*pos);*/
return;
}
return;
}
@@
-92,8
+93,11
@@
static void hpfs_pos_ins(loff_t *p, loff_t d, loff_t c)
{
if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) {
int n = (*p & 0x3f) + c;
{
if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) {
int n = (*p & 0x3f) + c;
- if (n > 0x3f) printk("HPFS: hpfs_pos_ins: %08x + %d\n", (int)*p, (int)c >> 8);
- else *p = (*p & ~0x3f) | n;
+ if (n > 0x3f)
+ pr_err("%s(): %08x + %d\n",
+ __func__, (int)*p, (int)c >> 8);
+ else
+ *p = (*p & ~0x3f) | n;
}
}
}
}
@@
-101,8
+105,11
@@
static void hpfs_pos_del(loff_t *p, loff_t d, loff_t c)
{
if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) {
int n = (*p & 0x3f) - c;
{
if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) {
int n = (*p & 0x3f) - c;
- if (n < 1) printk("HPFS: hpfs_pos_ins: %08x - %d\n", (int)*p, (int)c >> 8);
- else *p = (*p & ~0x3f) | n;
+ if (n < 1)
+ pr_err("%s(): %08x - %d\n",
+ __func__, (int)*p, (int)c >> 8);
+ else
+ *p = (*p & ~0x3f) | n;
}
}
}
}
@@
-239,12
+246,12
@@
static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno,
struct fnode *fnode;
int c1, c2 = 0;
if (!(nname = kmalloc(256, GFP_NOFS))) {
struct fnode *fnode;
int c1, c2 = 0;
if (!(nname = kmalloc(256, GFP_NOFS))) {
- pr
intk("HPFS:
out of memory, can't add to dnode\n");
+ pr
_err("
out of memory, can't add to dnode\n");
return 1;
}
go_up:
if (namelen >= 256) {
return 1;
}
go_up:
if (namelen >= 256) {
- hpfs_error(i->i_sb, "
hpfs_add_to_dnode: namelen == %d"
, namelen);
+ hpfs_error(i->i_sb, "
%s(): namelen == %d", __func__
, namelen);
kfree(nd);
kfree(nname);
return 1;
kfree(nd);
kfree(nname);
return 1;
@@
-281,7
+288,7
@@
static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno,
not be any error while splitting dnodes, otherwise the
whole directory, not only file we're adding, would
be lost. */
not be any error while splitting dnodes, otherwise the
whole directory, not only file we're adding, would
be lost. */
- pr
intk("HPFS:
out of memory for dnode splitting\n");
+ pr
_err("
out of memory for dnode splitting\n");
hpfs_brelse4(&qbh);
kfree(nname);
return 1;
hpfs_brelse4(&qbh);
kfree(nname);
return 1;
@@
-597,7
+604,7
@@
static void delete_empty_dnode(struct inode *i, dnode_secno dno)
if (!de_next->down) goto endm;
ndown = de_down_pointer(de_next);
if (!(de_cp = kmalloc(le16_to_cpu(de->length), GFP_NOFS))) {
if (!de_next->down) goto endm;
ndown = de_down_pointer(de_next);
if (!(de_cp = kmalloc(le16_to_cpu(de->length), GFP_NOFS))) {
- pr
intk("HPFS:
out of memory for dtree balancing\n");
+ pr
_err("
out of memory for dtree balancing\n");
goto endm;
}
memcpy(de_cp, de, le16_to_cpu(de->length));
goto endm;
}
memcpy(de_cp, de, le16_to_cpu(de->length));
@@
-612,7
+619,8
@@
static void delete_empty_dnode(struct inode *i, dnode_secno dno)
hpfs_brelse4(&qbh1);
}
hpfs_add_to_dnode(i, ndown, de_cp->name, de_cp->namelen, de_cp, de_cp->down ? de_down_pointer(de_cp) : 0);
hpfs_brelse4(&qbh1);
}
hpfs_add_to_dnode(i, ndown, de_cp->name, de_cp->namelen, de_cp, de_cp->down ? de_down_pointer(de_cp) : 0);
- /*printk("UP-TO-DNODE: %08x (ndown = %08x, down = %08x, dno = %08x)\n", up, ndown, down, dno);*/
+ /*pr_info("UP-TO-DNODE: %08x (ndown = %08x, down = %08x, dno = %08x)\n",
+ up, ndown, down, dno);*/
dno = up;
kfree(de_cp);
goto try_it_again;
dno = up;
kfree(de_cp);
goto try_it_again;
@@
-637,15
+645,15
@@
static void delete_empty_dnode(struct inode *i, dnode_secno dno)
if (!dlp && down) {
if (le32_to_cpu(d1->first_free) > 2044) {
if (hpfs_sb(i->i_sb)->sb_chk >= 2) {
if (!dlp && down) {
if (le32_to_cpu(d1->first_free) > 2044) {
if (hpfs_sb(i->i_sb)->sb_chk >= 2) {
- pr
intk("HPFS: warning:
unbalanced dnode tree, see hpfs.txt 4 more info\n");
- pr
intk("HPFS: warning:
terminating balancing operation\n");
+ pr
_err("
unbalanced dnode tree, see hpfs.txt 4 more info\n");
+ pr
_err("
terminating balancing operation\n");
}
hpfs_brelse4(&qbh1);
goto endm;
}
if (hpfs_sb(i->i_sb)->sb_chk >= 2) {
}
hpfs_brelse4(&qbh1);
goto endm;
}
if (hpfs_sb(i->i_sb)->sb_chk >= 2) {
- pr
intk("HPFS: warning:
unbalanced dnode tree, see hpfs.txt 4 more info\n");
- pr
intk("HPFS: warning:
goin'on\n");
+ pr
_err("
unbalanced dnode tree, see hpfs.txt 4 more info\n");
+ pr
_err("
goin'on\n");
}
le16_add_cpu(&del->length, 4);
del->down = 1;
}
le16_add_cpu(&del->length, 4);
del->down = 1;
@@
-659,7
+667,7
@@
static void delete_empty_dnode(struct inode *i, dnode_secno dno)
*(__le32 *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down);
} else goto endm;
if (!(de_cp = kmalloc(le16_to_cpu(de_prev->length), GFP_NOFS))) {
*(__le32 *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down);
} else goto endm;
if (!(de_cp = kmalloc(le16_to_cpu(de_prev->length), GFP_NOFS))) {
- pr
intk("HPFS:
out of memory for dtree balancing\n");
+ pr
_err("
out of memory for dtree balancing\n");
hpfs_brelse4(&qbh1);
goto endm;
}
hpfs_brelse4(&qbh1);
goto endm;
}
@@
-1000,7
+1008,7
@@
struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno,
int d1, d2 = 0;
name1 = f->name;
if (!(name2 = kmalloc(256, GFP_NOFS))) {
int d1, d2 = 0;
name1 = f->name;
if (!(name2 = kmalloc(256, GFP_NOFS))) {
- pr
intk("HPFS:
out of memory, can't map dirent\n");
+ pr
_err("
out of memory, can't map dirent\n");
return NULL;
}
if (f->len <= 15)
return NULL;
}
if (f->len <= 15)