git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
sparc64
/
solaris
/
fs.c
diff --git
a/arch/sparc64/solaris/fs.c
b/arch/sparc64/solaris/fs.c
index
d7c99fa
..
612477d
100644
(file)
--- a/
arch/sparc64/solaris/fs.c
+++ b/
arch/sparc64/solaris/fs.c
@@
-10,6
+10,7
@@
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/slab.h>
+#include <linux/capability.h>
#include <linux/fs.h>
#include <linux/namei.h>
#include <linux/mm.h>
#include <linux/fs.h>
#include <linux/namei.h>
#include <linux/mm.h>
@@
-362,7
+363,7
@@
static int report_statvfs(struct vfsmount *mnt, struct inode *inode, u32 buf)
int j = strlen (p);
if (j > 15) j = 15;
int j = strlen (p);
if (j > 15) j = 15;
- if (IS_RDONLY(inode)) i = 1;
+ if (IS_RDONLY(inode)
|| MNT_IS_RDONLY(mnt)
) i = 1;
if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
if (!sysv_valid_dev(inode->i_sb->s_dev))
return -EOVERFLOW;
if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
if (!sysv_valid_dev(inode->i_sb->s_dev))
return -EOVERFLOW;
@@
-398,7
+399,7
@@
static int report_statvfs64(struct vfsmount *mnt, struct inode *inode, u32 buf)
int j = strlen (p);
if (j > 15) j = 15;
int j = strlen (p);
if (j > 15) j = 15;
- if (IS_RDONLY(inode)) i = 1;
+ if (IS_RDONLY(inode)
|| MNT_IS_RDONLY(mnt)
) i = 1;
if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
if (!sysv_valid_dev(inode->i_sb->s_dev))
return -EOVERFLOW;
if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
if (!sysv_valid_dev(inode->i_sb->s_dev))
return -EOVERFLOW;