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
[Bluetooth] Integrate services into the driver model
[pandora-kernel.git]
/
fs
/
open.c
diff --git
a/fs/open.c
b/fs/open.c
index
53ec28c
..
303f06d
100644
(file)
--- a/
fs/open.c
+++ b/
fs/open.c
@@
-31,18
+31,18
@@
#include <asm/unistd.h>
#include <asm/unistd.h>
-int vfs_statfs(struct
super_block *sb
, struct kstatfs *buf)
+int vfs_statfs(struct
dentry *dentry
, struct kstatfs *buf)
{
int retval = -ENODEV;
{
int retval = -ENODEV;
- if (
sb
) {
+ if (
dentry
) {
retval = -ENOSYS;
retval = -ENOSYS;
- if (sb->s_op->statfs) {
+ if (
dentry->d_
sb->s_op->statfs) {
memset(buf, 0, sizeof(*buf));
memset(buf, 0, sizeof(*buf));
- retval = security_sb_statfs(
sb
);
+ retval = security_sb_statfs(
dentry
);
if (retval)
return retval;
if (retval)
return retval;
- retval =
sb->s_op->statfs(sb
, buf);
+ retval =
dentry->d_sb->s_op->statfs(dentry
, buf);
if (retval == 0 && buf->f_frsize == 0)
buf->f_frsize = buf->f_bsize;
}
if (retval == 0 && buf->f_frsize == 0)
buf->f_frsize = buf->f_bsize;
}
@@
-52,12
+52,12
@@
int vfs_statfs(struct super_block *sb, struct kstatfs *buf)
EXPORT_SYMBOL(vfs_statfs);
EXPORT_SYMBOL(vfs_statfs);
-static int vfs_statfs_native(struct
super_block *sb
, struct statfs *buf)
+static int vfs_statfs_native(struct
dentry *dentry
, struct statfs *buf)
{
struct kstatfs st;
int retval;
{
struct kstatfs st;
int retval;
- retval = vfs_statfs(
sb
, &st);
+ retval = vfs_statfs(
dentry
, &st);
if (retval)
return retval;
if (retval)
return retval;
@@
-95,12
+95,12
@@
static int vfs_statfs_native(struct super_block *sb, struct statfs *buf)
return 0;
}
return 0;
}
-static int vfs_statfs64(struct
super_block *sb
, struct statfs64 *buf)
+static int vfs_statfs64(struct
dentry *dentry
, struct statfs64 *buf)
{
struct kstatfs st;
int retval;
{
struct kstatfs st;
int retval;
- retval = vfs_statfs(
sb
, &st);
+ retval = vfs_statfs(
dentry
, &st);
if (retval)
return retval;
if (retval)
return retval;
@@
-130,7
+130,7
@@
asmlinkage long sys_statfs(const char __user * path, struct statfs __user * buf)
error = user_path_walk(path, &nd);
if (!error) {
struct statfs tmp;
error = user_path_walk(path, &nd);
if (!error) {
struct statfs tmp;
- error = vfs_statfs_native(nd.dentry
->d_inode->i_sb
, &tmp);
+ error = vfs_statfs_native(nd.dentry, &tmp);
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
error = -EFAULT;
path_release(&nd);
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
error = -EFAULT;
path_release(&nd);
@@
-149,7
+149,7
@@
asmlinkage long sys_statfs64(const char __user *path, size_t sz, struct statfs64
error = user_path_walk(path, &nd);
if (!error) {
struct statfs64 tmp;
error = user_path_walk(path, &nd);
if (!error) {
struct statfs64 tmp;
- error = vfs_statfs64(nd.dentry
->d_inode->i_sb
, &tmp);
+ error = vfs_statfs64(nd.dentry, &tmp);
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
error = -EFAULT;
path_release(&nd);
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
error = -EFAULT;
path_release(&nd);
@@
-168,7
+168,7
@@
asmlinkage long sys_fstatfs(unsigned int fd, struct statfs __user * buf)
file = fget(fd);
if (!file)
goto out;
file = fget(fd);
if (!file)
goto out;
- error = vfs_statfs_native(file->f_dentry
->d_inode->i_sb
, &tmp);
+ error = vfs_statfs_native(file->f_dentry, &tmp);
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
error = -EFAULT;
fput(file);
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
error = -EFAULT;
fput(file);
@@
-189,7
+189,7
@@
asmlinkage long sys_fstatfs64(unsigned int fd, size_t sz, struct statfs64 __user
file = fget(fd);
if (!file)
goto out;
file = fget(fd);
if (!file)
goto out;
- error = vfs_statfs64(file->f_dentry
->d_inode->i_sb
, &tmp);
+ error = vfs_statfs64(file->f_dentry, &tmp);
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
error = -EFAULT;
fput(file);
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
error = -EFAULT;
fput(file);
@@
-322,7
+322,7
@@
static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
error = locks_verify_truncate(inode, file, length);
if (!error)
error = locks_verify_truncate(inode, file, length);
if (!error)
- error = do_truncate(dentry, length,
0
, file);
+ error = do_truncate(dentry, length,
ATTR_MTIME|ATTR_CTIME
, file);
out_putf:
fput(file);
out:
out_putf:
fput(file);
out:
@@
-633,7
+633,7
@@
asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
dentry = file->f_dentry;
inode = dentry->d_inode;
dentry = file->f_dentry;
inode = dentry->d_inode;
- audit_inode(NULL, inode
, 0
);
+ audit_inode(NULL, inode);
err = -EROFS;
if (IS_RDONLY(inode))
err = -EROFS;
if (IS_RDONLY(inode))
@@
-786,7
+786,7
@@
asmlinkage long sys_fchown(unsigned int fd, uid_t user, gid_t group)
if (file) {
struct dentry * dentry;
dentry = file->f_dentry;
if (file) {
struct dentry * dentry;
dentry = file->f_dentry;
- audit_inode(NULL, dentry->d_inode
, 0
);
+ audit_inode(NULL, dentry->d_inode);
error = chown_common(dentry, user, group);
fput(file);
}
error = chown_common(dentry, user, group);
fput(file);
}
@@
-1124,7
+1124,6
@@
asmlinkage long sys_openat(int dfd, const char __user *filename, int flags,
prevent_tail_call(ret);
return ret;
}
prevent_tail_call(ret);
return ret;
}
-EXPORT_SYMBOL_GPL(sys_openat);
#ifndef __alpha__
#ifndef __alpha__
@@
-1153,7
+1152,7
@@
int filp_close(struct file *filp, fl_owner_t id)
}
if (filp->f_op && filp->f_op->flush)
}
if (filp->f_op && filp->f_op->flush)
- retval = filp->f_op->flush(filp);
+ retval = filp->f_op->flush(filp
, id
);
dnotify_flush(filp, id);
locks_remove_posix(filp, id);
dnotify_flush(filp, id);
locks_remove_posix(filp, id);