Home Home > GIT Browse > SLE12-SP5-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Henriques <lhenriques@suse.com>2019-08-27 11:14:09 +0100
committerLuis Henriques <lhenriques@suse.com>2019-09-05 10:07:45 +0100
commit35591684b7e0d7c7e6b0164b392fbdbe57135490 (patch)
tree4927b2ff8b6afa521a5a1d7bc0de6a559b31490a
parent72ddb93bda4d625d28e288bc2d0dd694f714f5ad (diff)
ceph: fix "ceph.dir.rctime" vxattr value (bsc#1148133 bsc#1135219).
-rw-r--r--patches.suse/ceph-fix-ceph-dir-rctime-vxattr-value.patch31
-rw-r--r--series.conf1
2 files changed, 32 insertions, 0 deletions
diff --git a/patches.suse/ceph-fix-ceph-dir-rctime-vxattr-value.patch b/patches.suse/ceph-fix-ceph-dir-rctime-vxattr-value.patch
new file mode 100644
index 0000000000..b54da58a5e
--- /dev/null
+++ b/patches.suse/ceph-fix-ceph-dir-rctime-vxattr-value.patch
@@ -0,0 +1,31 @@
+From: David Disseldorp <ddiss@suse.de>
+Date: Wed, 15 May 2019 16:56:39 +0200
+Subject: ceph: fix "ceph.dir.rctime" vxattr value
+Git-commit: 718807289d4130be1fe13f24f018733116958070
+Patch-mainline: v5.3-rc1
+References: bsc#1148133 bsc#1135219
+
+The vxattr value incorrectly places a "09" prefix to the nanoseconds
+field, instead of providing it as a zero-pad width specifier after '%'.
+
+Fixes: 3489b42a72a4 ("ceph: fix three bugs, two in ceph_vxattrcb_file_layout()")
+Link: https://tracker.ceph.com/issues/39943
+Signed-off-by: David Disseldorp <ddiss@suse.de>
+Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
+Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
+Acked-by: Luis Henriques <lhenriques@suse.com>
+---
+ fs/ceph/xattr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/ceph/xattr.c
++++ b/fs/ceph/xattr.c
+@@ -223,7 +223,7 @@ static size_t ceph_vxattrcb_dir_rbytes(s
+ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val,
+ size_t size)
+ {
+- return snprintf(val, size, "%ld.09%ld", (long)ci->i_rctime.tv_sec,
++ return snprintf(val, size, "%ld.%09ld", (long)ci->i_rctime.tv_sec,
+ (long)ci->i_rctime.tv_nsec);
+ }
+
diff --git a/series.conf b/series.conf
index 97e7cdd9ef..a43107248f 100644
--- a/series.conf
+++ b/series.conf
@@ -23911,6 +23911,7 @@
patches.suse/ALSA-seq-Break-too-long-mutex-context-in-the-write-l.patch
patches.suse/ceph-silence-a-checker-warning-in-mdsc_show.patch
patches.suse/ceph-clean-up-ceph-dir-pin-vxattr-name-sizeof.patch
+ patches.suse/ceph-fix-ceph-dir-rctime-vxattr-value.patch
patches.suse/cifs-Use-kmemdup-in-SMB2_ioctl_init-.patch
patches.suse/fs-cifs-Drop-unlikely-before-IS_ERR-_OR_NULL-.patch
patches.suse/SMB3-Add-SMB3-1-1-GCM-to-negotiated-crypto-algorigthms.patch