projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selin...
[powerpc.git]
/
arch
/
mips
/
kernel
/
sysirix.c
diff --git
a/arch/mips/kernel/sysirix.c
b/arch/mips/kernel/sysirix.c
index
6c2406a
..
93a1484
100644
(file)
--- a/
arch/mips/kernel/sysirix.c
+++ b/
arch/mips/kernel/sysirix.c
@@
-669,7
+669,7
@@
asmlinkage int irix_mount(char __user *dev_name, char __user *dir_name,
struct irix_statfs {
short f_type;
struct irix_statfs {
short f_type;
-
long f_bsize, f_frsize, f_blocks, f_bfree, f_files, f_ffree;
+ long f_bsize, f_frsize, f_blocks, f_bfree, f_files, f_ffree;
char f_fname[6], f_fpack[6];
};
char f_fname[6], f_fpack[6];
};
@@
-959,7
+959,7
@@
static inline loff_t llseek(struct file *file, loff_t offset, int origin)
fn = default_llseek;
if (file->f_op && file->f_op->llseek)
fn = default_llseek;
if (file->f_op && file->f_op->llseek)
-
fn = file->f_op->llseek;
+ fn = file->f_op->llseek;
lock_kernel();
retval = fn(file, offset, origin);
unlock_kernel();
lock_kernel();
retval = fn(file, offset, origin);
unlock_kernel();