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 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
[firefly-linux-kernel-4.4.55.git]
/
fs
/
efs
/
namei.c
diff --git
a/fs/efs/namei.c
b/fs/efs/namei.c
index 356c044e2cd302276f43c19031e74b8f678de35b..bbee8f063dfab1bba67b34fc07424a79c51ff47c 100644
(file)
--- a/
fs/efs/namei.c
+++ b/
fs/efs/namei.c
@@
-12,7
+12,8
@@
#include "efs.h"
#include "efs.h"
-static efs_ino_t efs_find_entry(struct inode *inode, const char *name, int len) {
+static efs_ino_t efs_find_entry(struct inode *inode, const char *name, int len)
+{
struct buffer_head *bh;
int slot, namelen;
struct buffer_head *bh;
int slot, namelen;
@@
-40,10
+41,10
@@
static efs_ino_t efs_find_entry(struct inode *inode, const char *name, int len)
if (be16_to_cpu(dirblock->magic) != EFS_DIRBLK_MAGIC) {
pr_err("%s(): invalid directory block\n", __func__);
brelse(bh);
if (be16_to_cpu(dirblock->magic) != EFS_DIRBLK_MAGIC) {
pr_err("%s(): invalid directory block\n", __func__);
brelse(bh);
- return
(0)
;
+ return
0
;
}
}
- for(slot = 0; slot < dirblock->slots; slot++) {
+ for
(slot = 0; slot < dirblock->slots; slot++) {
dirslot = (struct efs_dentry *) (((char *) bh->b_data) + EFS_SLOTAT(dirblock, slot));
namelen = dirslot->namelen;
dirslot = (struct efs_dentry *) (((char *) bh->b_data) + EFS_SLOTAT(dirblock, slot));
namelen = dirslot->namelen;
@@
-52,12
+53,12
@@
static efs_ino_t efs_find_entry(struct inode *inode, const char *name, int len)
if ((namelen == len) && (!memcmp(name, nameptr, len))) {
inodenum = be32_to_cpu(dirslot->inode);
brelse(bh);
if ((namelen == len) && (!memcmp(name, nameptr, len))) {
inodenum = be32_to_cpu(dirslot->inode);
brelse(bh);
- return
(inodenum)
;
+ return
inodenum
;
}
}
brelse(bh);
}
}
}
brelse(bh);
}
- return
(0)
;
+ return
0
;
}
struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
}
struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)