RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 19-Jul-2014 20:58:57
Branch: rpm-5_4 Handle: 2014071918585304
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio iosm.c
Log:
- iosm: fix: set st_ino to handle XFS 64b inodes (PLD).
Summary:
Revision Changes Path
1.3501.2.404+1 -0 rpm/CHANGES
1.43.2.6 +2 -0 rpm/rpmio/iosm.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.403 -r1.3501.2.404 CHANGES
--- rpm/CHANGES 19 Jul 2014 18:53:55 -0000 1.3501.2.403
+++ rpm/CHANGES 19 Jul 2014 18:58:53 -0000 1.3501.2.404
@@ -1,4 +1,5 @@
5.4.14 -> 5.4.15:
+ - jbj: iosm: fix: set st_ino to handle XFS 64b inodes (PLD).
- jbj: nss: list compiled in ECC curves.
- jbj: nss: fix: adjust PQG generation to handle DSA2.
- jbj: nss: fix: resurrect rsa signature leading zero bytes.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/iosm.c
============================================================================
$ cvs diff -u -r1.43.2.5 -r1.43.2.6 iosm.c
--- rpm/rpmio/iosm.c 27 Jun 2013 13:04:31 -0000 1.43.2.5
+++ rpm/rpmio/iosm.c 19 Jul 2014 18:58:57 -0000 1.43.2.6
@@ -955,6 +955,7 @@
if (fi && i >= 0 && i < (int)fi->fc) {
mode_t perms = (S_ISDIR(st->st_mode) ? fi->dperms : fi->fperms);
mode_t finalMode = (fi->fmodes ? (mode_t)fi->fmodes[i] : perms);
+ ino_t finalInode = (fi->finodes ? (ino_t)fi->finodes[i] : 0);
dev_t finalRdev = (fi->frdevs ? fi->frdevs[i] : 0);
rpmuint32_t finalMtime = (fi->fmtimes ? fi->fmtimes[i] : 0);
uid_t uid = fi->uid;
@@ -994,6 +995,7 @@
&& st->st_nlink == 0)
st->st_nlink = 1;
st->st_rdev = finalRdev;
+ st->st_ino = finalInode;
st->st_mtime = finalMtime;
}
if (iosm->mapFlags & IOSM_MAP_UID)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
