git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MIPS] irq_cpu: use handle_percpu_irq handler to avoid dropping interrupts.
[sfrench/cifs-2.6.git]
/
fs
/
stat.c
diff --git
a/fs/stat.c
b/fs/stat.c
index bca07eb2003c395b8e40d33cfe3ce548065d9ff7..68510068a6414e46f510033f9dc1477a4704672b 100644
(file)
--- a/
fs/stat.c
+++ b/
fs/stat.c
@@
-8,7
+8,6
@@
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/file.h>
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/file.h>
-#include <linux/smp_lock.h>
#include <linux/highuid.h>
#include <linux/fs.h>
#include <linux/namei.h>
#include <linux/highuid.h>
#include <linux/fs.h>
#include <linux/namei.h>
@@
-51,13
+50,6
@@
int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
return inode->i_op->getattr(mnt, dentry, stat);
generic_fillattr(inode, stat);
return inode->i_op->getattr(mnt, dentry, stat);
generic_fillattr(inode, stat);
- if (!stat->blksize) {
- struct super_block *s = inode->i_sb;
- unsigned blocks;
- blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
- stat->blocks = (s->s_blocksize / 512) * blocks;
- stat->blksize = s->s_blocksize;
- }
return 0;
}
return 0;
}
@@
-109,7
+101,7
@@
int vfs_fstat(unsigned int fd, struct kstat *stat)
int error = -EBADF;
if (f) {
int error = -EBADF;
if (f) {
- error = vfs_getattr(f->f_
vfsmnt, f->f_
dentry, stat);
+ error = vfs_getattr(f->f_
path.mnt, f->f_path.
dentry, stat);
fput(f);
}
return error;
fput(f);
}
return error;