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
LU-10698 obdclass: allow specifying complex jobids
[fs/lustre-release.git]
/
lustre
/
obdclass
/
linux
/
linux-obdo.c
diff --git
a/lustre/obdclass/linux/linux-obdo.c
b/lustre/obdclass/linux/linux-obdo.c
index
382db01
..
67d2842
100644
(file)
--- a/
lustre/obdclass/linux/linux-obdo.c
+++ b/
lustre/obdclass/linux/linux-obdo.c
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* 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
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-27,7
+23,7
@@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
4
, Intel Corporation.
+ * Copyright (c) 2012, 201
7
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-44,14
+40,13
@@
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/module.h>
-#include <linux/pagemap.h> /* for PAGE_CACHE_SIZE */
-#include <lustre/lustre_idl.h>
+#include <linux/pagemap.h> /* for PAGE_SIZE */
#include <obd_class.h>
/*FIXME: Just copy from obdo_from_inode*/
#include <obd_class.h>
/*FIXME: Just copy from obdo_from_inode*/
-void obdo_from_la(struct obdo *dst, const struct lu_attr *la,
__
u64 valid)
+void obdo_from_la(struct obdo *dst, const struct lu_attr *la, u64 valid)
{
{
- u
32
newvalid = 0;
+ u
64
newvalid = 0;
if (valid & LA_ATIME) {
dst->o_atime = la->la_atime;
if (valid & LA_ATIME) {
dst->o_atime = la->la_atime;
@@
-91,6
+86,10
@@
void obdo_from_la(struct obdo *dst, const struct lu_attr *la, __u64 valid)
dst->o_gid = la->la_gid;
newvalid |= OBD_MD_FLGID;
}
dst->o_gid = la->la_gid;
newvalid |= OBD_MD_FLGID;
}
+ if (valid & LA_PROJID) {
+ dst->o_projid = la->la_projid;
+ newvalid |= OBD_MD_FLPROJID;
+ }
if (valid & LA_FLAGS) {
dst->o_flags = la->la_flags;
newvalid |= OBD_MD_FLFLAGS;
if (valid & LA_FLAGS) {
dst->o_flags = la->la_flags;
newvalid |= OBD_MD_FLFLAGS;
@@
-100,9
+99,9
@@
void obdo_from_la(struct obdo *dst, const struct lu_attr *la, __u64 valid)
EXPORT_SYMBOL(obdo_from_la);
/*FIXME: Just copy from obdo_from_inode*/
EXPORT_SYMBOL(obdo_from_la);
/*FIXME: Just copy from obdo_from_inode*/
-void la_from_obdo(struct lu_attr *dst, const struct obdo *obdo, u
32
valid)
+void la_from_obdo(struct lu_attr *dst, const struct obdo *obdo, u
64
valid)
{
{
-
__
u64 newvalid = 0;
+ u64 newvalid = 0;
valid &= obdo->o_valid;
valid &= obdo->o_valid;
@@
-144,6
+143,10
@@
void la_from_obdo(struct lu_attr *dst, const struct obdo *obdo, u32 valid)
dst->la_gid = obdo->o_gid;
newvalid |= LA_GID;
}
dst->la_gid = obdo->o_gid;
newvalid |= LA_GID;
}
+ if (valid & OBD_MD_FLPROJID) {
+ dst->la_projid = obdo->o_projid;
+ newvalid |= LA_PROJID;
+ }
if (valid & OBD_MD_FLFLAGS) {
dst->la_flags = obdo->o_flags;
newvalid |= LA_FLAGS;
if (valid & OBD_MD_FLFLAGS) {
dst->la_flags = obdo->o_flags;
newvalid |= LA_FLAGS;