git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracing/filter: Do not allow infix to exceed end of string
[pandora-kernel.git]
/
fs
/
libfs.c
diff --git
a/fs/libfs.c
b/fs/libfs.c
index
0ab6512
..
cb1fb4b
100644
(file)
--- a/
fs/libfs.c
+++ b/
fs/libfs.c
@@
-22,13
+22,13
@@
static inline int simple_positive(struct dentry *dentry)
{
static inline int simple_positive(struct dentry *dentry)
{
- return d
entry->d_inode
&& !d_unhashed(dentry);
+ return d
_really_is_positive(dentry)
&& !d_unhashed(dentry);
}
int simple_getattr(struct vfsmount *mnt, struct dentry *dentry,
struct kstat *stat)
{
}
int simple_getattr(struct vfsmount *mnt, struct dentry *dentry,
struct kstat *stat)
{
- struct inode *inode = d
entry->d_inode
;
+ struct inode *inode = d
_inode(dentry)
;
generic_fillattr(inode, stat);
stat->blocks = inode->i_mapping->nrpages << (PAGE_CACHE_SHIFT - 9);
return 0;
generic_fillattr(inode, stat);
stat->blocks = inode->i_mapping->nrpages << (PAGE_CACHE_SHIFT - 9);
return 0;
@@
-94,7
+94,7
@@
EXPORT_SYMBOL(dcache_dir_close);
loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)
{
struct dentry *dentry = file->f_path.dentry;
loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)
{
struct dentry *dentry = file->f_path.dentry;
- mutex_lock(&d
entry->d_inode
->i_mutex);
+ mutex_lock(&d
_inode(dentry)
->i_mutex);
switch (whence) {
case 1:
offset += file->f_pos;
switch (whence) {
case 1:
offset += file->f_pos;
@@
-102,7
+102,7
@@
loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)
if (offset >= 0)
break;
default:
if (offset >= 0)
break;
default:
- mutex_unlock(&d
entry->d_inode
->i_mutex);
+ mutex_unlock(&d
_inode(dentry)
->i_mutex);
return -EINVAL;
}
if (offset != file->f_pos) {
return -EINVAL;
}
if (offset != file->f_pos) {
@@
-129,7
+129,7
@@
loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)
spin_unlock(&dentry->d_lock);
}
}
spin_unlock(&dentry->d_lock);
}
}
- mutex_unlock(&d
entry->d_inode
->i_mutex);
+ mutex_unlock(&d
_inode(dentry)
->i_mutex);
return offset;
}
EXPORT_SYMBOL(dcache_dir_lseek);
return offset;
}
EXPORT_SYMBOL(dcache_dir_lseek);
@@
-169,7
+169,7
@@
int dcache_readdir(struct file *file, struct dir_context *ctx)
spin_unlock(&next->d_lock);
spin_unlock(&dentry->d_lock);
if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
spin_unlock(&next->d_lock);
spin_unlock(&dentry->d_lock);
if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
-
next->d_inode->i_ino, dt_type(next->d_inode
)))
+
d_inode(next)->i_ino, dt_type(d_inode(next)
)))
return 0;
spin_lock(&dentry->d_lock);
spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
return 0;
spin_lock(&dentry->d_lock);
spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
@@
-270,7
+270,7
@@
EXPORT_SYMBOL(simple_open);
int simple_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
{
int simple_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
{
- struct inode *inode =
old_dentry->d_inode
;
+ struct inode *inode =
d_inode(old_dentry)
;
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
inc_nlink(inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
inc_nlink(inode);
@@
-304,7
+304,7
@@
EXPORT_SYMBOL(simple_empty);
int simple_unlink(struct inode *dir, struct dentry *dentry)
{
int simple_unlink(struct inode *dir, struct dentry *dentry)
{
- struct inode *inode = d
entry->d_inode
;
+ struct inode *inode = d
_inode(dentry)
;
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
drop_nlink(inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
drop_nlink(inode);
@@
-318,7
+318,7
@@
int simple_rmdir(struct inode *dir, struct dentry *dentry)
if (!simple_empty(dentry))
return -ENOTEMPTY;
if (!simple_empty(dentry))
return -ENOTEMPTY;
- drop_nlink(d
entry->d_inode
);
+ drop_nlink(d
_inode(dentry)
);
simple_unlink(dir, dentry);
drop_nlink(dir);
return 0;
simple_unlink(dir, dentry);
drop_nlink(dir);
return 0;
@@
-328,16
+328,16
@@
EXPORT_SYMBOL(simple_rmdir);
int simple_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry)
{
int simple_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry)
{
- struct inode *inode =
old_dentry->d_inode
;
+ struct inode *inode =
d_inode(old_dentry)
;
int they_are_dirs = d_is_dir(old_dentry);
if (!simple_empty(new_dentry))
return -ENOTEMPTY;
int they_are_dirs = d_is_dir(old_dentry);
if (!simple_empty(new_dentry))
return -ENOTEMPTY;
- if (
new_dentry->d_inode
) {
+ if (
d_really_is_positive(new_dentry)
) {
simple_unlink(new_dir, new_dentry);
if (they_are_dirs) {
simple_unlink(new_dir, new_dentry);
if (they_are_dirs) {
- drop_nlink(
new_dentry->d_inode
);
+ drop_nlink(
d_inode(new_dentry)
);
drop_nlink(old_dir);
}
} else if (they_are_dirs) {
drop_nlink(old_dir);
}
} else if (they_are_dirs) {
@@
-368,7
+368,7
@@
EXPORT_SYMBOL(simple_rename);
*/
int simple_setattr(struct dentry *dentry, struct iattr *iattr)
{
*/
int simple_setattr(struct dentry *dentry, struct iattr *iattr)
{
- struct inode *inode = d
entry->d_inode
;
+ struct inode *inode = d
_inode(dentry)
;
int error;
error = inode_change_ok(inode, iattr);
int error;
error = inode_change_ok(inode, iattr);