Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b=22190 return error on write if rdonly mode is on, don't reply if umount
[fs/lustre-release.git]
/
lustre
/
obdclass
/
obdo.c
diff --git
a/lustre/obdclass/obdo.c
b/lustre/obdclass/obdo.c
index
c6484e4
..
774f0ba
100644
(file)
--- a/
lustre/obdclass/obdo.c
+++ b/
lustre/obdclass/obdo.c
@@
-16,8
+16,8
@@
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
[sun.com URL with a
- *
copy of GPLv2].
+ * version 2 along with this program; If not, see
+ *
http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
@@
-56,9
+56,6
@@
void obdo_cpy_md(struct obdo *dst, struct obdo *src, obd_flag valid)
{
#ifdef __KERNEL__
void obdo_cpy_md(struct obdo *dst, struct obdo *src, obd_flag valid)
{
#ifdef __KERNEL__
- CLASSERT(sizeof(struct lustre_handle) +
- sizeof(struct llog_cookie) <= sizeof(src->o_inline));
-
CDEBUG(D_INODE, "src obdo "LPX64" valid "LPX64", dst obdo "LPX64"\n",
src->o_id, src->o_valid, dst->o_id);
#endif
CDEBUG(D_INODE, "src obdo "LPX64" valid "LPX64", dst obdo "LPX64"\n",
src->o_id, src->o_valid, dst->o_id);
#endif
@@
-86,8
+83,10
@@
void obdo_cpy_md(struct obdo *dst, struct obdo *src, obd_flag valid)
dst->o_flags = src->o_flags;
if (valid & OBD_MD_FLGENER)
dst->o_generation = src->o_generation;
dst->o_flags = src->o_flags;
if (valid & OBD_MD_FLGENER)
dst->o_generation = src->o_generation;
- if (valid & OBD_MD_FLINLINE)
- memcpy(dst->o_inline, src->o_inline, sizeof(src->o_inline));
+ if (valid & OBD_MD_FLHANDLE)
+ dst->o_handle = src->o_handle;
+ if (valid & OBD_MD_FLCOOKIE)
+ dst->o_lcookie = src->o_lcookie;
dst->o_valid |= valid;
}
dst->o_valid |= valid;
}
@@
-164,7
+163,8
@@
void obdo_from_iattr(struct obdo *oa, struct iattr *attr, unsigned int ia_valid)
if (ia_valid & ATTR_MODE) {
oa->o_mode = attr->ia_mode;
oa->o_valid |= OBD_MD_FLTYPE | OBD_MD_FLMODE;
if (ia_valid & ATTR_MODE) {
oa->o_mode = attr->ia_mode;
oa->o_valid |= OBD_MD_FLTYPE | OBD_MD_FLMODE;
- if (!in_group_p(oa->o_gid) && !capable(CAP_FSETID))
+ if (!cfs_curproc_is_in_groups(oa->o_gid) &&
+ !cfs_capable(CFS_CAP_FSETID))
oa->o_mode &= ~S_ISGID;
}
if (ia_valid & ATTR_UID) {
oa->o_mode &= ~S_ISGID;
}
if (ia_valid & ATTR_UID) {
@@
-212,7
+212,8
@@
void iattr_from_obdo(struct iattr *attr, struct obdo *oa, obd_flag valid)
if (valid & OBD_MD_FLMODE) {
attr->ia_mode = (attr->ia_mode & S_IFMT)|(oa->o_mode & ~S_IFMT);
attr->ia_valid |= ATTR_MODE;
if (valid & OBD_MD_FLMODE) {
attr->ia_mode = (attr->ia_mode & S_IFMT)|(oa->o_mode & ~S_IFMT);
attr->ia_valid |= ATTR_MODE;
- if (!in_group_p(oa->o_gid) && !capable(CAP_FSETID))
+ if (!cfs_curproc_is_in_groups(oa->o_gid) &&
+ !cfs_capable(CFS_CAP_FSETID))
attr->ia_mode &= ~S_ISGID;
}
if (valid & OBD_MD_FLUID) {
attr->ia_mode &= ~S_ISGID;
}
if (valid & OBD_MD_FLUID) {