forked from pool/openafs
cfa65eea8c
- update to openafs-1.8.11 - apply upstream patches for kernel 6.8 * 056a7a8.diff * 05ac614.diff * 073adec.diff * 0d9f6cf.diff * 0e983a9.diff * 112fb94.diff * 1e1bf8e.diff * 2056ce8.diff * 5312d06.diff * 67e48c8.diff * 6b20756.diff * 743d72f.diff * 7cae97b.diff * 81b910a.diff * 87ab04a.diff * 9f052c1.diff * a14a9ad.diff * a87845d.diff * aae8b00.diff * b77b304.diff * d1c89ac.diff * d9f3a2c.diff * db91384.diff * dffd0e1.diff * e0f425a.diff * e157f8f.diff * e428053.diff * ef7b8c5.diff * f5bafb0.diff * fca6fd9.diff OBS-URL: https://build.opensuse.org/request/show/1170220 OBS-URL: https://build.opensuse.org/package/show/filesystems/openafs?expand=0&rev=123
127 lines
4.5 KiB
Diff
127 lines
4.5 KiB
Diff
From 073adec17a9b7b55d3672b17f7faa4a122ce6e9d Mon Sep 17 00:00:00 2001
|
|
From: Cheyenne Wills <cwills@sinenomine.net>
|
|
Date: Thu, 08 Feb 2024 12:22:13 -0700
|
|
Subject: [PATCH] afs: Remove SRXAFSCB_FetchData/StoreData
|
|
|
|
Commit 'client-64bit-file-size-support-20011031' (971b18bc42) introduced
|
|
the RPC functions SRXAFSCB_FetchData() and SRXAFSCB_StoreData with RPC
|
|
numbers of 65536 and 65537 respectively.
|
|
|
|
Commit 'more-64bit-file-size-support-20011031' (c5b1a3775f) removed the
|
|
references from afscbint.xg, but did not remove the actual code. The
|
|
65536 RPC number was reassigned to SRXAFSCB_GetCE64, and the commit:
|
|
'This is mostly a rewrite of src/afs/afs_cell.c, and associated changes'
|
|
(629d08065) assigned the 65537 RPC to SRXAFSCB_GetCellByNum.
|
|
|
|
Remove the 2 functions since there are no references other than the
|
|
prototype in afs_prototypes.h.
|
|
|
|
This function is flagged due to a missing prototype when building
|
|
against a Linux 6.8 kernel (which sets the -Wmissing-declarations and
|
|
-Wmissing-prototypes compiler flags as default). Linux 6.8 commit:
|
|
'Makefile.extrawarn: turn on missing-prototypes globally' (0fcb70851f).
|
|
|
|
Reviewed-on: https://gerrit.openafs.org/15639
|
|
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
|
|
Tested-by: BuildBot <buildbot@rampaginggeek.com>
|
|
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
|
|
(cherry picked from commit 379f7fc51d411990189ec28e48c91edc87d76120)
|
|
|
|
Change-Id: I1a3539227d22e6df89d78245634dfeb14943035a
|
|
---
|
|
|
|
diff --git a/src/afs/afs_callback.c b/src/afs/afs_callback.c
|
|
index 22edefb..56e8cd2 100644
|
|
--- a/src/afs/afs_callback.c
|
|
+++ b/src/afs/afs_callback.c
|
|
@@ -1473,71 +1473,6 @@
|
|
}
|
|
|
|
/*------------------------------------------------------------------------
|
|
- * EXPORTED SRXAFSCB_FetchData
|
|
- *
|
|
- * Description:
|
|
- * Routine to do third party move from a remioserver to the original
|
|
- * issuer of an ArchiveData request. Presently supported only by the
|
|
- * "fs" command, not by the AFS client.
|
|
- *
|
|
- * Arguments:
|
|
- * rxcall: Ptr to Rx call on which this request came in.
|
|
- * Fid: pointer to AFSFid structure.
|
|
- * Fd: File descriptor inside fs command.
|
|
- * Position: Offset in the file.
|
|
- * Length: Data length to transfer.
|
|
- * TotalLength: Pointer to total file length field
|
|
- *
|
|
- * Returns:
|
|
- * 0 on success
|
|
- *
|
|
- * Environment:
|
|
- * Nothing interesting.
|
|
- *
|
|
- * Side Effects:
|
|
- *------------------------------------------------------------------------*/
|
|
-int
|
|
-SRXAFSCB_FetchData(struct rx_call *rxcall, struct AFSFid *Fid, afs_int32 Fd,
|
|
- afs_int64 Position, afs_int64 Length,
|
|
- afs_int64 * TotalLength)
|
|
-{
|
|
- return ENOSYS;
|
|
-}
|
|
-
|
|
-/*------------------------------------------------------------------------
|
|
- * EXPORTED SRXAFSCB_StoreData
|
|
- *
|
|
- * Description:
|
|
- * Routine to do third party move from a remioserver to the original
|
|
- * issuer of a RetrieveData request. Presently supported only by the
|
|
- * "fs" command, not by the AFS client.
|
|
- *
|
|
- * Arguments:
|
|
- * rxcall: Ptr to Rx call on which this request came in.
|
|
- * Fid: pointer to AFSFid structure.
|
|
- * Fd: File descriptor inside fs command.
|
|
- * Position: Offset in the file.
|
|
- * Length: Data length to transfer.
|
|
- * TotalLength: Pointer to total file length field
|
|
- *
|
|
- * Returns:
|
|
- * 0 on success
|
|
- *
|
|
- * Environment:
|
|
- * Nothing interesting.
|
|
- *
|
|
- * Side Effects:
|
|
- * As advertised.
|
|
- *------------------------------------------------------------------------*/
|
|
-int
|
|
-SRXAFSCB_StoreData(struct rx_call *rxcall, struct AFSFid *Fid, afs_int32 Fd,
|
|
- afs_int64 Position, afs_int64 Length,
|
|
- afs_int64 * TotalLength)
|
|
-{
|
|
- return ENOSYS;
|
|
-}
|
|
-
|
|
-/*------------------------------------------------------------------------
|
|
* EXPORTED SRXAFSCB_GetCellByNum
|
|
*
|
|
* Description:
|
|
diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
|
|
index ed43635..208bd03 100644
|
|
--- a/src/afs/afs_prototypes.h
|
|
+++ b/src/afs/afs_prototypes.h
|
|
@@ -103,13 +103,6 @@
|
|
afs_uint32 * serverVersion,
|
|
afs_uint32 * configCount,
|
|
cacheConfig * config);
|
|
-extern int SRXAFSCB_FetchData(struct rx_call *rxcall, struct AFSFid *Fid,
|
|
- afs_int32 Fd, afs_int64 Position,
|
|
- afs_int64 Length, afs_int64 * TotalLength);
|
|
-extern int SRXAFSCB_StoreData(struct rx_call *rxcall, struct AFSFid *Fid,
|
|
- afs_int32 Fd, afs_int64 Position,
|
|
- afs_int64 Length, afs_int64 * TotalLength);
|
|
-
|
|
|
|
/* afs_cbqueue.c */
|
|
extern afs_rwlock_t afs_xcbhash;
|