[Pkg-lustre-svn-commit] updated: [03fdd31] Fixed credentials
Patrick Winnertz
winnie at debian.org
Fri Aug 21 12:23:13 UTC 2009
The following commit has been merged in the lustre-1.6 branch:
commit 03fdd31f0023041e1a6044b54874c2884002a432
Author: Patrick Winnertz <winnie at debian.org>
Date: Thu Aug 20 14:32:46 2009 +0200
Fixed credentials
Signed-off-by: Patrick Winnertz <winnie at debian.org>
diff --git a/debian/patches/patchless_support_2.6.30.dpatch b/debian/patches/patchless_support_2.6.30.dpatch
index b66c5cf..796ea56 100755
--- a/debian/patches/patchless_support_2.6.30.dpatch
+++ b/debian/patches/patchless_support_2.6.30.dpatch
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad lustre~/build/autoMakefile.am.toplevel lustre/build/autoMakefile.am.toplevel
--- lustre~/build/autoMakefile.am.toplevel 2009-08-19 09:51:07.000000000 +0200
-+++ lustre/build/autoMakefile.am.toplevel 2009-08-20 14:07:57.000000000 +0200
++++ lustre/build/autoMakefile.am.toplevel 2009-08-20 14:27:44.000000000 +0200
@@ -51,7 +51,7 @@
modules: $(DEP) all-sources
$(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ) \
@@ -19,7 +19,7 @@ diff -urNad lustre~/build/autoMakefile.am.toplevel lustre/build/autoMakefile.am.
endif # LINUX
diff -urNad lustre~/build/autoconf/lustre-build-linux.m4 lustre/build/autoconf/lustre-build-linux.m4
--- lustre~/build/autoconf/lustre-build-linux.m4 2009-08-19 09:51:07.000000000 +0200
-+++ lustre/build/autoconf/lustre-build-linux.m4 2009-08-20 14:07:57.000000000 +0200
++++ lustre/build/autoconf/lustre-build-linux.m4 2009-08-20 14:27:44.000000000 +0200
@@ -308,6 +308,24 @@
AC_SUBST(UML_CFLAGS)
])
@@ -47,7 +47,7 @@ diff -urNad lustre~/build/autoconf/lustre-build-linux.m4 lustre/build/autoconf/l
diff -urNad lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lnet.m4
--- lustre~/lnet/autoconf/lustre-lnet.m4 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lnet/autoconf/lustre-lnet.m4 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lnet/autoconf/lustre-lnet.m4 2009-08-20 14:27:44.000000000 +0200
@@ -1362,6 +1362,22 @@
])
])
@@ -82,14 +82,17 @@ diff -urNad lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lne
#
diff -urNad lustre~/lnet/include/libcfs/libcfs.h lustre/lnet/include/libcfs/libcfs.h
--- lustre~/lnet/include/libcfs/libcfs.h 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lnet/include/libcfs/libcfs.h 2009-08-20 14:07:57.000000000 +0200
-@@ -60,6 +60,11 @@
++++ lustre/lnet/include/libcfs/libcfs.h 2009-08-20 14:32:25.000000000 +0200
+@@ -60,6 +60,14 @@
#include <stdio.h>
#endif
+#ifdef HAVE_CRED_IN_STRUCT_TASK_STRUCT
+# define CRED(ts) ts->cred
+# define CREDENTIALS(ts,x) CRED(ts)->x
++#else
++# define CRED(ts) ts
++# define CREDENTIALS(ts,x) CRED(ts)->x
+#endif
+
/* Controlled via configure key */
@@ -97,7 +100,7 @@ diff -urNad lustre~/lnet/include/libcfs/libcfs.h lustre/lnet/include/libcfs/libc
diff -urNad lustre~/lnet/include/lnet/types.h lustre/lnet/include/lnet/types.h
--- lustre~/lnet/include/lnet/types.h 2008-08-07 11:50:16.000000000 +0200
-+++ lustre/lnet/include/lnet/types.h 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lnet/include/lnet/types.h 2009-08-20 14:27:44.000000000 +0200
@@ -39,6 +39,21 @@
#include <libcfs/libcfs.h>
@@ -122,7 +125,7 @@ diff -urNad lustre~/lnet/include/lnet/types.h lustre/lnet/include/lnet/types.h
typedef __u64 lnet_nid_t;
diff -urNad lustre~/lnet/klnds/socklnd/socklnd.c lustre/lnet/klnds/socklnd/socklnd.c
--- lustre~/lnet/klnds/socklnd/socklnd.c 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lnet/klnds/socklnd/socklnd.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lnet/klnds/socklnd/socklnd.c 2009-08-20 14:27:44.000000000 +0200
@@ -41,6 +41,7 @@
* Author: Eric Barton <eric at bartonsoftware.com>
*/
@@ -133,7 +136,7 @@ diff -urNad lustre~/lnet/klnds/socklnd/socklnd.c lustre/lnet/klnds/socklnd/sockl
lnd_t the_ksocklnd = {
diff -urNad lustre~/lnet/libcfs/linux/linux-curproc.c lustre/lnet/libcfs/linux/linux-curproc.c
--- lustre~/lnet/libcfs/linux/linux-curproc.c 2008-11-20 10:27:06.000000000 +0100
-+++ lustre/lnet/libcfs/linux/linux-curproc.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lnet/libcfs/linux/linux-curproc.c 2009-08-20 14:27:44.000000000 +0200
@@ -41,6 +41,7 @@
*/
@@ -243,7 +246,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-curproc.c lustre/lnet/libcfs/linux/l
int cfs_capable(cfs_cap_t cap)
diff -urNad lustre~/lnet/libcfs/linux/linux-module.c lustre/lnet/libcfs/linux/linux-module.c
--- lustre~/lnet/libcfs/linux/linux-module.c 2008-09-15 20:44:53.000000000 +0200
-+++ lustre/lnet/libcfs/linux/linux-module.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lnet/libcfs/linux/linux-module.c 2009-08-20 14:27:44.000000000 +0200
@@ -139,7 +139,7 @@
struct cfs_psdev_file pfile;
int rc = 0;
@@ -255,7 +258,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-module.c lustre/lnet/libcfs/linux/li
if ( _IOC_TYPE(cmd) != IOC_LIBCFS_TYPE ||
diff -urNad lustre~/lnet/libcfs/linux/linux-prim.c lustre/lnet/libcfs/linux/linux-prim.c
--- lustre~/lnet/libcfs/linux/linux-prim.c 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lnet/libcfs/linux/linux-prim.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lnet/libcfs/linux/linux-prim.c 2009-08-20 14:27:44.000000000 +0200
@@ -40,6 +40,7 @@
#endif
#include <linux/module.h>
@@ -275,7 +278,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-prim.c lustre/lnet/libcfs/linux/linu
#else
diff -urNad lustre~/lnet/libcfs/linux/linux-tcpip.c lustre/lnet/libcfs/linux/linux-tcpip.c
--- lustre~/lnet/libcfs/linux/linux-tcpip.c 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lnet/libcfs/linux/linux-tcpip.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lnet/libcfs/linux/linux-tcpip.c 2009-08-20 14:27:44.000000000 +0200
@@ -63,7 +63,11 @@
return rc;
}
@@ -290,7 +293,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-tcpip.c lustre/lnet/libcfs/linux/lin
sock_release(sock);
diff -urNad lustre~/lnet/lnet/api-ni.c lustre/lnet/lnet/api-ni.c
--- lustre~/lnet/lnet/api-ni.c 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lnet/lnet/api-ni.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lnet/lnet/api-ni.c 2009-08-20 14:27:44.000000000 +0200
@@ -1032,7 +1032,7 @@
#ifdef __KERNEL__
if (lnd == NULL) {
@@ -302,7 +305,7 @@ diff -urNad lustre~/lnet/lnet/api-ni.c lustre/lnet/lnet/api-ni.c
lnd = lnet_find_lnd_by_type(lnd_type);
diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
--- lustre~/lustre/autoconf/lustre-core.m4 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lustre/autoconf/lustre-core.m4 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/autoconf/lustre-core.m4 2009-08-20 14:27:44.000000000 +0200
@@ -1106,15 +1106,20 @@
AC_DEFUN([LC_PAGE_CHECKED],
[AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked])
@@ -977,7 +980,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
])
diff -urNad lustre~/lustre/include/liblustre.h lustre/lustre/include/liblustre.h
--- lustre~/lustre/include/liblustre.h 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lustre/include/liblustre.h 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/include/liblustre.h 2009-08-20 14:27:44.000000000 +0200
@@ -586,6 +586,52 @@
int signal;
};
@@ -1042,7 +1045,7 @@ diff -urNad lustre~/lustre/include/liblustre.h lustre/lustre/include/liblustre.h
#define cfs_curproc_pid() (current->pid)
diff -urNad lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include/linux/lustre_compat25.h
--- lustre~/lustre/include/linux/lustre_compat25.h 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_compat25.h 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/include/linux/lustre_compat25.h 2009-08-20 14:27:44.000000000 +0200
@@ -44,8 +44,8 @@
#endif
@@ -1201,7 +1204,7 @@ diff -urNad lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include
{
diff -urNad lustre~/lustre/include/linux/lustre_lib.h lustre/lustre/include/linux/lustre_lib.h
--- lustre~/lustre/include/linux/lustre_lib.h 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_lib.h 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/include/linux/lustre_lib.h 2009-08-20 14:27:44.000000000 +0200
@@ -49,7 +49,6 @@
# include <string.h>
# include <sys/types.h>
@@ -1212,7 +1215,7 @@ diff -urNad lustre~/lustre/include/linux/lustre_lib.h lustre/lustre/include/linu
# include <linux/signal.h>
diff -urNad lustre~/lustre/include/linux/lustre_patchless_compat.h lustre/lustre/include/linux/lustre_patchless_compat.h
--- lustre~/lustre/include/linux/lustre_patchless_compat.h 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_patchless_compat.h 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/include/linux/lustre_patchless_compat.h 2009-08-20 14:27:44.000000000 +0200
@@ -52,7 +52,7 @@
BUG_ON(!PageLocked(page));
@@ -1233,7 +1236,7 @@ diff -urNad lustre~/lustre/include/linux/lustre_patchless_compat.h lustre/lustre
spin_unlock_irq(&mapping->tree_lock);
diff -urNad lustre~/lustre/include/lprocfs_status.h lustre/lustre/include/lprocfs_status.h
--- lustre~/lustre/include/lprocfs_status.h 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/include/lprocfs_status.h 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/include/lprocfs_status.h 2009-08-20 14:27:44.000000000 +0200
@@ -521,6 +521,8 @@
#define LPROCFS_EXIT() do { \
up_read(&_lprocfs_lock); \
@@ -1268,7 +1271,7 @@ diff -urNad lustre~/lustre/include/lprocfs_status.h lustre/lustre/include/lprocf
#define LPROCFS_CLIMP_CHECK(obd) do { \
diff -urNad lustre~/lustre/include/lustre/ll_fiemap.h lustre/lustre/include/lustre/ll_fiemap.h
--- lustre~/lustre/include/lustre/ll_fiemap.h 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/include/lustre/ll_fiemap.h 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/include/lustre/ll_fiemap.h 2009-08-20 14:27:44.000000000 +0200
@@ -86,7 +86,8 @@
#define FIEMAP_EXTENT_UNKNOWN 0x00000002 /* Data location unknown. */
#define FIEMAP_EXTENT_DELALLOC 0x00000004 /* Location still pending.
@@ -1342,13 +1345,16 @@ diff -urNad lustre~/lustre/include/lustre/ll_fiemap.h lustre/lustre/include/lust
diff -urNad lustre~/lustre/include/lustre_lite.h lustre/lustre/include/lustre_lite.h
--- lustre~/lustre/include/lustre_lite.h 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/include/lustre_lite.h 2009-08-20 14:07:57.000000000 +0200
-@@ -53,6 +53,13 @@
++++ lustre/lustre/include/lustre_lite.h 2009-08-20 14:31:22.000000000 +0200
+@@ -53,6 +53,16 @@
#include <lustre_mds.h>
#include <lustre_ha.h>
+#ifdef HAVE_CRED_IN_STRUCT_TASK_STRUCT
-+# define CRED(ts) ts->cred
++# define CRED(ts) ts->cred
++# define CREDENTIALS(ts,x) CRED(ts)->x
++#else
++# define CRED(ts) ts
+# define CREDENTIALS(ts,x) CRED(ts)->x
+#endif
+
@@ -1359,7 +1365,7 @@ diff -urNad lustre~/lustre/include/lustre_lite.h lustre/lustre/include/lustre_li
/* careful, this is easy to screw up */
diff -urNad lustre~/lustre/liblustre/lutil.c lustre/lustre/liblustre/lutil.c
--- lustre~/lustre/liblustre/lutil.c 2009-08-11 12:37:07.000000000 +0200
-+++ lustre/lustre/liblustre/lutil.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/liblustre/lutil.c 2009-08-20 14:27:44.000000000 +0200
@@ -176,7 +176,7 @@
#define FAKE_ROOT_CAP 0x1ffffeff
#define FAKE_USER_CAP 0
@@ -1456,7 +1462,7 @@ diff -urNad lustre~/lustre/liblustre/lutil.c lustre/lustre/liblustre/lutil.c
int cfs_capable(cfs_cap_t cap)
diff -urNad lustre~/lustre/liblustre/super.c lustre/lustre/liblustre/super.c
--- lustre~/lustre/liblustre/super.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/liblustre/super.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/liblustre/super.c 2009-08-20 14:27:44.000000000 +0200
@@ -82,7 +82,7 @@
struct intnl_stat *st = llu_i2stat(inode);
mode_t mode = st->st_mode;
@@ -1510,7 +1516,7 @@ diff -urNad lustre~/lustre/liblustre/super.c lustre/lustre/liblustre/super.c
liblustre_wait_event(0);
diff -urNad lustre~/lustre/llite/dir.c lustre/lustre/llite/dir.c
--- lustre~/lustre/llite/dir.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/dir.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/dir.c 2009-08-20 14:27:44.000000000 +0200
@@ -955,7 +955,7 @@
GOTO(out_quotactl, rc = -EPERM);
break;
@@ -1521,8 +1527,8 @@ diff -urNad lustre~/lustre/llite/dir.c lustre/lustre/llite/dir.c
!cfs_capable(CFS_CAP_SYS_ADMIN))
GOTO(out_quotactl, rc = -EPERM);
diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
---- lustre~/lustre/llite/file.c 2009-08-20 14:07:56.000000000 +0200
-+++ lustre/lustre/llite/file.c 2009-08-20 14:07:57.000000000 +0200
+--- lustre~/lustre/llite/file.c 2009-08-20 14:27:43.000000000 +0200
++++ lustre/lustre/llite/file.c 2009-08-20 14:27:44.000000000 +0200
@@ -1817,11 +1817,12 @@
#endif
}
@@ -1755,7 +1761,7 @@ diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
.flock = ll_file_noflock,
diff -urNad lustre~/lustre/llite/llite_internal.h lustre/lustre/llite/llite_internal.h
--- lustre~/lustre/llite/llite_internal.h 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/llite_internal.h 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/llite_internal.h 2009-08-20 14:27:44.000000000 +0200
@@ -596,8 +596,13 @@
void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry);
@@ -1791,7 +1797,7 @@ diff -urNad lustre~/lustre/llite/llite_internal.h lustre/lustre/llite/llite_inte
extern struct inode_operations ll_special_inode_operations;
diff -urNad lustre~/lustre/llite/llite_lib.c lustre/lustre/llite/llite_lib.c
--- lustre~/lustre/llite/llite_lib.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/llite_lib.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/llite_lib.c 2009-08-20 14:27:44.000000000 +0200
@@ -1346,7 +1346,7 @@
rc = vmtruncate(inode, new_size);
clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
@@ -1812,7 +1818,7 @@ diff -urNad lustre~/lustre/llite/llite_lib.c lustre/lustre/llite/llite_lib.c
}
diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c
--- lustre~/lustre/llite/llite_mmap.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/llite_mmap.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/llite_mmap.c 2009-08-20 14:27:44.000000000 +0200
@@ -81,8 +81,7 @@
int lt_get_mmap_locks(struct ll_lock_tree *tree,
unsigned long addr, size_t count);
@@ -2112,7 +2118,7 @@ diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c
#endif
diff -urNad lustre~/lustre/llite/llite_nfs.c lustre/lustre/llite/llite_nfs.c
--- lustre~/lustre/llite/llite_nfs.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/llite_nfs.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/llite_nfs.c 2009-08-20 14:27:44.000000000 +0200
@@ -68,36 +68,30 @@
}
@@ -2409,7 +2415,7 @@ diff -urNad lustre~/lustre/llite/llite_nfs.c lustre/lustre/llite/llite_nfs.c
#endif
diff -urNad lustre~/lustre/llite/lloop.c lustre/lustre/llite/lloop.c
--- lustre~/lustre/llite/lloop.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/lloop.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/lloop.c 2009-08-20 14:27:44.000000000 +0200
@@ -152,7 +152,7 @@
struct semaphore lo_bh_mutex;
atomic_t lo_pending;
@@ -2583,7 +2589,7 @@ diff -urNad lustre~/lustre/llite/lloop.c lustre/lustre/llite/lloop.c
if (ll_unregister_blkdev(lloop_major, "lloop"))
diff -urNad lustre~/lustre/llite/lproc_llite.c lustre/lustre/llite/lproc_llite.c
--- lustre~/lustre/llite/lproc_llite.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/lproc_llite.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/lproc_llite.c 2009-08-20 14:27:44.000000000 +0200
@@ -649,7 +649,7 @@
sbi->ll_stats_track_id == current->p_pptr->pid)
lprocfs_counter_add(sbi->ll_stats, op, count);
@@ -2595,7 +2601,7 @@ diff -urNad lustre~/lustre/llite/lproc_llite.c lustre/lustre/llite/lproc_llite.c
EXPORT_SYMBOL(ll_stats_ops_tally);
diff -urNad lustre~/lustre/llite/namei.c lustre/lustre/llite/namei.c
--- lustre~/lustre/llite/namei.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/namei.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/namei.c 2009-08-20 14:27:44.000000000 +0200
@@ -875,7 +875,7 @@
GOTO(err_exit, err);
@@ -2607,7 +2613,7 @@ diff -urNad lustre~/lustre/llite/namei.c lustre/lustre/llite/namei.c
GOTO(err_exit, err);
diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c
--- lustre~/lustre/llite/rw.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/rw.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/rw.c 2009-08-20 14:27:44.000000000 +0200
@@ -61,6 +61,8 @@
#define DEBUG_SUBSYSTEM S_LLITE
@@ -2838,7 +2844,7 @@ diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c
}
diff -urNad lustre~/lustre/llite/rw24.c lustre/lustre/llite/rw24.c
--- lustre~/lustre/llite/rw24.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/rw24.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/rw24.c 2009-08-20 14:27:44.000000000 +0200
@@ -150,8 +150,13 @@
.readpage = ll_readpage,
.direct_IO = ll_direct_IO_24,
@@ -2855,7 +2861,7 @@ diff -urNad lustre~/lustre/llite/rw24.c lustre/lustre/llite/rw24.c
.bmap = NULL,
diff -urNad lustre~/lustre/llite/rw26.c lustre/lustre/llite/rw26.c
--- lustre~/lustre/llite/rw26.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/rw26.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/rw26.c 2009-08-20 14:27:44.000000000 +0200
@@ -339,8 +339,13 @@
.writepages = generic_writepages,
.set_page_dirty = __set_page_dirty_nobuffers,
@@ -2872,7 +2878,7 @@ diff -urNad lustre~/lustre/llite/rw26.c lustre/lustre/llite/rw26.c
.bmap = NULL
diff -urNad lustre~/lustre/llite/symlink.c lustre/lustre/llite/symlink.c
--- lustre~/lustre/llite/symlink.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/symlink.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/llite/symlink.c 2009-08-20 14:27:44.000000000 +0200
@@ -177,8 +177,12 @@
up(&lli->lli_size_sem);
}
@@ -2888,7 +2894,7 @@ diff -urNad lustre~/lustre/llite/symlink.c lustre/lustre/llite/symlink.c
diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt.c lustre/lustre/lvfs/lustre_quota_fmt.c
--- lustre~/lustre/lvfs/lustre_quota_fmt.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/lvfs/lustre_quota_fmt.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/lvfs/lustre_quota_fmt.c 2009-08-20 14:27:44.000000000 +0200
@@ -50,7 +50,12 @@
#include <linux/init.h>
#include <linux/module.h>
@@ -2905,7 +2911,7 @@ diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt.c lustre/lustre/lvfs/lustre_quo
#include <asm/uaccess.h>
diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt_convert.c lustre/lustre/lvfs/lustre_quota_fmt_convert.c
--- lustre~/lustre/lvfs/lustre_quota_fmt_convert.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/lvfs/lustre_quota_fmt_convert.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/lvfs/lustre_quota_fmt_convert.c 2009-08-20 14:27:44.000000000 +0200
@@ -50,7 +50,11 @@
#include <linux/init.h>
#include <linux/module.h>
@@ -2921,7 +2927,7 @@ diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt_convert.c lustre/lustre/lvfs/lu
#include <asm/uaccess.h>
diff -urNad lustre~/lustre/lvfs/lvfs_linux.c lustre/lustre/lvfs/lvfs_linux.c
--- lustre~/lustre/lvfs/lvfs_linux.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/lvfs/lvfs_linux.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/lvfs/lvfs_linux.c 2009-08-20 14:27:44.000000000 +0200
@@ -86,10 +86,19 @@
current_ngroups = 0;
} else {
@@ -3048,8 +3054,8 @@ diff -urNad lustre~/lustre/lvfs/lvfs_linux.c lustre/lustre/lvfs/lvfs_linux.c
diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
--- lustre~/lustre/mdc/mdc_lib.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/mdc/mdc_lib.c 2009-08-20 14:11:57.000000000 +0200
-@@ -56,8 +57,8 @@
++++ lustre/lustre/mdc/mdc_lib.c 2009-08-20 14:27:44.000000000 +0200
+@@ -56,8 +56,8 @@
struct mds_body *b;
b = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*b));
@@ -3060,7 +3066,7 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
b->capability = cfs_curproc_cap_pack();
b->fid1 = *fid;
b->size = pg_off; /* !! */
-@@ -69,8 +70,8 @@
+@@ -69,8 +69,8 @@
{
LASSERT (b != NULL);
@@ -3071,7 +3077,7 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
b->capability = cfs_curproc_cap_pack();
}
-@@ -166,8 +167,8 @@
+@@ -166,8 +166,8 @@
/* XXX do something about time, uid, gid */
rec->cr_opcode = REINT_OPEN;
@@ -3082,7 +3088,7 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
rec->cr_cap = cfs_curproc_cap_pack();
rec->cr_fid = op_data->fid1;
memset(&rec->cr_replayfid, 0, sizeof(rec->cr_replayfid));
-@@ -240,8 +241,8 @@
+@@ -240,8 +240,8 @@
struct mds_rec_setattr *rec = lustre_msg_buf(req->rq_reqmsg, offset,
sizeof(*rec));
rec->sa_opcode = REINT_SETATTR;
@@ -3093,7 +3099,7 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
rec->sa_cap = cfs_curproc_cap_pack();
rec->sa_fid = data->fid1;
rec->sa_suppgid = -1;
-@@ -284,8 +285,8 @@
+@@ -284,8 +284,8 @@
LASSERT (rec != NULL);
rec->ul_opcode = REINT_UNLINK;
@@ -3104,7 +3110,7 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
rec->ul_cap = cfs_curproc_cap_pack();
rec->ul_mode = data->create_mode;
rec->ul_suppgid = data->suppgids[0];
-@@ -307,8 +308,8 @@
+@@ -307,8 +307,8 @@
rec = lustre_msg_buf(req->rq_reqmsg, offset, sizeof (*rec));
rec->lk_opcode = REINT_LINK;
@@ -3115,7 +3121,7 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
rec->lk_cap = cfs_curproc_cap_pack();
rec->lk_suppgid1 = data->suppgids[0];
rec->lk_suppgid2 = data->suppgids[1];
-@@ -331,8 +332,8 @@
+@@ -331,8 +331,8 @@
/* XXX do something about time, uid, gid */
rec->rn_opcode = REINT_RENAME;
@@ -3126,7 +3132,7 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
rec->rn_cap = cfs_curproc_cap_pack();
rec->rn_suppgid1 = data->suppgids[0];
rec->rn_suppgid2 = data->suppgids[1];
-@@ -355,8 +356,8 @@
+@@ -355,8 +355,8 @@
struct mds_body *b;
b = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*b));
@@ -3139,7 +3145,7 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
b->flags = flags | MDS_BFLAG_EXT_FLAGS;
diff -urNad lustre~/lustre/mgc/mgc_request.c lustre/lustre/mgc/mgc_request.c
--- lustre~/lustre/mgc/mgc_request.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/mgc/mgc_request.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/mgc/mgc_request.c 2009-08-20 14:27:44.000000000 +0200
@@ -415,7 +415,7 @@
obd->obd_lvfs_ctxt.fs = get_ds();
@@ -3151,7 +3157,7 @@ diff -urNad lustre~/lustre/mgc/mgc_request.c lustre/lustre/mgc/mgc_request.c
if (IS_ERR(dentry)) {
diff -urNad lustre~/lustre/obdclass/linux/linux-module.c lustre/lustre/obdclass/linux/linux-module.c
--- lustre~/lustre/obdclass/linux/linux-module.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/obdclass/linux/linux-module.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/obdclass/linux/linux-module.c 2009-08-20 14:27:44.000000000 +0200
@@ -204,7 +204,7 @@
int err = 0;
ENTRY;
@@ -3180,7 +3186,7 @@ diff -urNad lustre~/lustre/obdclass/linux/linux-module.c lustre/lustre/obdclass/
CERROR("error registering /proc/fs/lustre/devices\n");
diff -urNad lustre~/lustre/obdclass/linux/linux-sysctl.c lustre/lustre/obdclass/linux/linux-sysctl.c
--- lustre~/lustre/obdclass/linux/linux-sysctl.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-08-20 14:27:44.000000000 +0200
@@ -56,7 +56,9 @@
cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -3455,7 +3461,7 @@ diff -urNad lustre~/lustre/obdclass/linux/linux-sysctl.c lustre/lustre/obdclass/
.maxlen = 0,
diff -urNad lustre~/lustre/obdclass/lprocfs_status.c lustre/lustre/obdclass/lprocfs_status.c
--- lustre~/lustre/obdclass/lprocfs_status.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/obdclass/lprocfs_status.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/obdclass/lprocfs_status.c 2009-08-20 14:27:44.000000000 +0200
@@ -151,7 +151,7 @@
LPROCFS_ENTRY();
@@ -3476,7 +3482,7 @@ diff -urNad lustre~/lustre/obdclass/lprocfs_status.c lustre/lustre/obdclass/lpro
return rc;
diff -urNad lustre~/lustre/obdclass/lustre_handles.c lustre/lustre/obdclass/lustre_handles.c
--- lustre~/lustre/obdclass/lustre_handles.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/obdclass/lustre_handles.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/obdclass/lustre_handles.c 2009-08-20 14:27:44.000000000 +0200
@@ -56,6 +56,14 @@
# define rcu_read_unlock() spin_unlock(&bucket->lock)
#endif /* ifndef HAVE_RCU */
@@ -3494,7 +3500,7 @@ diff -urNad lustre~/lustre/obdclass/lustre_handles.c lustre/lustre/obdclass/lust
static spinlock_t handle_base_lock;
diff -urNad lustre~/lustre/ptlrpc/service.c lustre/lustre/ptlrpc/service.c
--- lustre~/lustre/ptlrpc/service.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/ptlrpc/service.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/ptlrpc/service.c 2009-08-20 14:27:44.000000000 +0200
@@ -1497,11 +1497,17 @@
{
struct fs_struct *fs = current->fs;
@@ -3516,7 +3522,7 @@ diff -urNad lustre~/lustre/ptlrpc/service.c lustre/lustre/ptlrpc/service.c
static void
diff -urNad lustre~/lustre/ptlrpc/wiretest.c lustre/lustre/ptlrpc/wiretest.c
--- lustre~/lustre/ptlrpc/wiretest.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/ptlrpc/wiretest.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/ptlrpc/wiretest.c 2009-08-20 14:27:44.000000000 +0200
@@ -2319,7 +2319,7 @@
CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
@@ -3528,7 +3534,7 @@ diff -urNad lustre~/lustre/ptlrpc/wiretest.c lustre/lustre/ptlrpc/wiretest.c
CLASSERT(FIEMAP_EXTENT_DATA_COMPRESSED == 0x00000040);
diff -urNad lustre~/lustre/quota/quota_context.c lustre/lustre/quota/quota_context.c
--- lustre~/lustre/quota/quota_context.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/quota/quota_context.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/quota/quota_context.c 2009-08-20 14:27:44.000000000 +0200
@@ -240,7 +240,11 @@
int ret = 0;
ENTRY;
@@ -3591,7 +3597,7 @@ diff -urNad lustre~/lustre/quota/quota_context.c lustre/lustre/quota/quota_conte
data.obd = obd;
diff -urNad lustre~/lustre/quota/quota_interface.c lustre/lustre/quota/quota_interface.c
--- lustre~/lustre/quota/quota_interface.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/quota/quota_interface.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/quota/quota_interface.c 2009-08-20 14:27:44.000000000 +0200
@@ -149,7 +149,11 @@
{
ENTRY;
@@ -3630,7 +3636,7 @@ diff -urNad lustre~/lustre/quota/quota_interface.c lustre/lustre/quota/quota_int
spin_lock(&qctxt->lqc_lock);
diff -urNad lustre~/lustre/quota/quota_internal.h lustre/lustre/quota/quota_internal.h
--- lustre~/lustre/quota/quota_internal.h 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/quota/quota_internal.h 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/quota/quota_internal.h 2009-08-20 14:27:44.000000000 +0200
@@ -41,6 +41,14 @@
#ifdef HAVE_QUOTA_SUPPORT
@@ -3648,7 +3654,7 @@ diff -urNad lustre~/lustre/quota/quota_internal.h lustre/lustre/quota/quota_inte
diff -urNad lustre~/lustre/utils/wiretest.c lustre/lustre/utils/wiretest.c
--- lustre~/lustre/utils/wiretest.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/utils/wiretest.c 2009-08-20 14:07:57.000000000 +0200
++++ lustre/lustre/utils/wiretest.c 2009-08-20 14:27:44.000000000 +0200
@@ -2317,7 +2317,7 @@
CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
--
Lustre Debian Packaging
More information about the Pkg-lustre-svn-commit
mailing list