projects
/
GitHub
/
LineageOS
/
android_kernel_samsung_universal7580.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
[GitHub/LineageOS/android_kernel_samsung_universal7580.git]
/
fs
/
hfsplus
/
dir.c
diff --git
a/fs/hfsplus/dir.c
b/fs/hfsplus/dir.c
index 031c24e5052182fb31351e8b79ba5166959485b7..a37ac934732f6707bbf6a0825f9d04d179c76743 100644
(file)
--- a/
fs/hfsplus/dir.c
+++ b/
fs/hfsplus/dir.c
@@
-103,7
+103,7
@@
again:
} else if (!dentry->d_fsdata)
dentry->d_fsdata = (void *)(unsigned long)cnid;
} else {
} else if (!dentry->d_fsdata)
dentry->d_fsdata = (void *)(unsigned long)cnid;
} else {
- pr
intk(KERN_ERR "hfs:
invalid catalog entry type in lookup\n");
+ pr
_err("
invalid catalog entry type in lookup\n");
err = -EIO;
goto fail;
}
err = -EIO;
goto fail;
}
@@
-159,12
+159,12
@@
static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
fd.entrylength);
if (be16_to_cpu(entry.type) != HFSPLUS_FOLDER_THREAD) {
hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
fd.entrylength);
if (be16_to_cpu(entry.type) != HFSPLUS_FOLDER_THREAD) {
- pr
intk(KERN_ERR "hfs:
bad catalog folder thread\n");
+ pr
_err("
bad catalog folder thread\n");
err = -EIO;
goto out;
}
if (fd.entrylength < HFSPLUS_MIN_THREAD_SZ) {
err = -EIO;
goto out;
}
if (fd.entrylength < HFSPLUS_MIN_THREAD_SZ) {
- pr
intk(KERN_ERR "hfs:
truncated catalog thread\n");
+ pr
_err("
truncated catalog thread\n");
err = -EIO;
goto out;
}
err = -EIO;
goto out;
}
@@
-183,7
+183,7
@@
static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
for (;;) {
if (be32_to_cpu(fd.key->cat.parent) != inode->i_ino) {
for (;;) {
if (be32_to_cpu(fd.key->cat.parent) != inode->i_ino) {
- pr
intk(KERN_ERR "hfs:
walked past end of dir\n");
+ pr
_err("
walked past end of dir\n");
err = -EIO;
goto out;
}
err = -EIO;
goto out;
}
@@
-203,7
+203,7
@@
static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
if (type == HFSPLUS_FOLDER) {
if (fd.entrylength <
sizeof(struct hfsplus_cat_folder)) {
if (type == HFSPLUS_FOLDER) {
if (fd.entrylength <
sizeof(struct hfsplus_cat_folder)) {
- pr
intk(KERN_ERR "hfs:
small dir entry\n");
+ pr
_err("
small dir entry\n");
err = -EIO;
goto out;
}
err = -EIO;
goto out;
}
@@
-216,7
+216,7
@@
static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
break;
} else if (type == HFSPLUS_FILE) {
if (fd.entrylength < sizeof(struct hfsplus_cat_file)) {
break;
} else if (type == HFSPLUS_FILE) {
if (fd.entrylength < sizeof(struct hfsplus_cat_file)) {
- pr
intk(KERN_ERR "hfs:
small file entry\n");
+ pr
_err("
small file entry\n");
err = -EIO;
goto out;
}
err = -EIO;
goto out;
}
@@
-224,7
+224,7
@@
static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
be32_to_cpu(entry.file.id), DT_REG))
break;
} else {
be32_to_cpu(entry.file.id), DT_REG))
break;
} else {
- pr
intk(KERN_ERR "hfs:
bad catalog entry type\n");
+ pr
_err("
bad catalog entry type\n");
err = -EIO;
goto out;
}
err = -EIO;
goto out;
}