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
ath9k: DFS radar use correct width enum
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ext4
/
namei.c
diff --git
a/fs/ext4/namei.c
b/fs/ext4/namei.c
index 1bec5a5c1e45a29e9ead318987ec03d803104c5a..5a0408d7b1147094c3e82b6d11750b33396b7732 100644
(file)
--- a/
fs/ext4/namei.c
+++ b/
fs/ext4/namei.c
@@
-2319,7
+2319,7
@@
retry:
d_tmpfile(dentry, inode);
err = ext4_orphan_add(handle, inode);
if (err)
d_tmpfile(dentry, inode);
err = ext4_orphan_add(handle, inode);
if (err)
- goto err_
drop
_inode;
+ goto err_
unlock
_inode;
mark_inode_dirty(inode);
unlock_new_inode(inode);
}
mark_inode_dirty(inode);
unlock_new_inode(inode);
}
@@
-2328,10
+2328,9
@@
retry:
if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries))
goto retry;
return err;
if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries))
goto retry;
return err;
-err_
drop
_inode:
+err_
unlock
_inode:
ext4_journal_stop(handle);
unlock_new_inode(inode);
ext4_journal_stop(handle);
unlock_new_inode(inode);
- iput(inode);
return err;
}
return err;
}