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
arm64: dts: rockchip: add L2 cache node for rk3368
[firefly-linux-kernel-4.4.55.git]
/
fs
/
hfsplus
/
dir.c
diff --git
a/fs/hfsplus/dir.c
b/fs/hfsplus/dir.c
index f0235c1640af7ec29edb92541f66dfc739c9b0db..d0f39dcbb58e86057c91c2e32a9d538178da39c5 100644
(file)
--- a/
fs/hfsplus/dir.c
+++ b/
fs/hfsplus/dir.c
@@
-81,7
+81,7
@@
again:
HFSPLUS_I(HFSPLUS_SB(sb)->hidden_dir)->
create_date ||
entry.file.create_date ==
HFSPLUS_I(HFSPLUS_SB(sb)->hidden_dir)->
create_date ||
entry.file.create_date ==
- HFSPLUS_I(
sb->s_root->d_inode
)->
+ HFSPLUS_I(
d_inode(sb->s_root)
)->
create_date) &&
HFSPLUS_SB(sb)->hidden_dir) {
struct qstr str;
create_date) &&
HFSPLUS_SB(sb)->hidden_dir) {
struct qstr str;
@@
-296,8
+296,8
@@
static int hfsplus_link(struct dentry *src_dentry, struct inode *dst_dir,
struct dentry *dst_dentry)
{
struct hfsplus_sb_info *sbi = HFSPLUS_SB(dst_dir->i_sb);
struct dentry *dst_dentry)
{
struct hfsplus_sb_info *sbi = HFSPLUS_SB(dst_dir->i_sb);
- struct inode *inode =
src_dentry->d_inode
;
- struct inode *src_dir =
src_dentry->d_parent->d_inode
;
+ struct inode *inode =
d_inode(src_dentry)
;
+ struct inode *src_dir =
d_inode(src_dentry->d_parent)
;
struct qstr str;
char name[32];
u32 cnid, id;
struct qstr str;
char name[32];
u32 cnid, id;
@@
-353,7
+353,7
@@
out:
static int hfsplus_unlink(struct inode *dir, struct dentry *dentry)
{
struct hfsplus_sb_info *sbi = HFSPLUS_SB(dir->i_sb);
static int hfsplus_unlink(struct inode *dir, struct dentry *dentry)
{
struct hfsplus_sb_info *sbi = HFSPLUS_SB(dir->i_sb);
- struct inode *inode = d
entry->d_inode
;
+ struct inode *inode = d
_inode(dentry)
;
struct qstr str;
char name[32];
u32 cnid;
struct qstr str;
char name[32];
u32 cnid;
@@
-410,7
+410,7
@@
out:
static int hfsplus_rmdir(struct inode *dir, struct dentry *dentry)
{
struct hfsplus_sb_info *sbi = HFSPLUS_SB(dir->i_sb);
static int hfsplus_rmdir(struct inode *dir, struct dentry *dentry)
{
struct hfsplus_sb_info *sbi = HFSPLUS_SB(dir->i_sb);
- struct inode *inode = d
entry->d_inode
;
+ struct inode *inode = d
_inode(dentry)
;
int res;
if (inode->i_size != 2)
int res;
if (inode->i_size != 2)
@@
-434,7
+434,7
@@
static int hfsplus_symlink(struct inode *dir, struct dentry *dentry,
{
struct hfsplus_sb_info *sbi = HFSPLUS_SB(dir->i_sb);
struct inode *inode;
{
struct hfsplus_sb_info *sbi = HFSPLUS_SB(dir->i_sb);
struct inode *inode;
- int res = -ENO
SPC
;
+ int res = -ENO
MEM
;
mutex_lock(&sbi->vh_mutex);
inode = hfsplus_new_inode(dir->i_sb, S_IFLNK | S_IRWXUGO);
mutex_lock(&sbi->vh_mutex);
inode = hfsplus_new_inode(dir->i_sb, S_IFLNK | S_IRWXUGO);
@@
-476,7
+476,7
@@
static int hfsplus_mknod(struct inode *dir, struct dentry *dentry,
{
struct hfsplus_sb_info *sbi = HFSPLUS_SB(dir->i_sb);
struct inode *inode;
{
struct hfsplus_sb_info *sbi = HFSPLUS_SB(dir->i_sb);
struct inode *inode;
- int res = -ENO
SPC
;
+ int res = -ENO
MEM
;
mutex_lock(&sbi->vh_mutex);
inode = hfsplus_new_inode(dir->i_sb, mode);
mutex_lock(&sbi->vh_mutex);
inode = hfsplus_new_inode(dir->i_sb, mode);
@@
-529,7
+529,7
@@
static int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry,
int res;
/* Unlink destination if it already exists */
int res;
/* Unlink destination if it already exists */
- if (
new_dentry->d_inode
) {
+ if (
d_really_is_positive(new_dentry)
) {
if (d_is_dir(new_dentry))
res = hfsplus_rmdir(new_dir, new_dentry);
else
if (d_is_dir(new_dentry))
res = hfsplus_rmdir(new_dir, new_dentry);
else