jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 13:38:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux: d_delete now takes a const argument

Browse Source 
The d_delete dentry operation now takes a const argument.  Test for
this and define our function accordingly to avoid warnings.

Reviewed-on: http://gerrit.openafs.org/5335
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit def00ae8ba774f4d7290c29208484dda756dc0e0)

Change-Id: I128a721587f4963849652cb389472a550d81d267
Reviewed-on: http://gerrit.openafs.org/6097
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
Marc Dionne 2011-09-03 14:10:50 -04:00 committed by Derrick Brashear
parent ef492dc1e1
commit 7f55b45ed7
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acinclude.m4
View File

@ -917,6 +917,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
LINUX_IOP_I_PERMISSION_TAKES_FLAGS
LINUX_IOP_I_PERMISSION_TAKES_NAMEIDATA
LINUX_IOP_I_PUT_LINK_TAKES_COOKIE
LINUX_DOP_D_DELETE_TAKES_CONST
LINUX_DOP_D_REVALIDATE_TAKES_NAMEIDATA
LINUX_FOP_F_FLUSH_TAKES_FL_OWNER_T
LINUX_FOP_F_FSYNC_TAKES_DENTRY

4
src/afs/LINUX/osi_vnodeops.c
View File

@ -961,7 +961,11 @@ afs_dentry_iput(struct dentry *dp, struct inode *ip)
}
static int
#if defined(DOP_D_DELETE_TAKES_CONST)
afs_dentry_delete(const struct dentry *dp)
#else
afs_dentry_delete(struct dentry *dp)
#endif
{
if (dp->d_inode && (VTOAFS(dp->d_inode)->f.states & CUnlinked))
return 1; /* bad inode? */

14
src/cf/linux-test4.m4
View File

@ -604,3 +604,17 @@ AC_DEFUN([LINUX_D_COUNT_IS_INT], [
[define if dentry->d_count is an int],
[-Werror])
])
AC_DEFUN([LINUX_DOP_D_DELETE_TAKES_CONST], [
AC_CHECK_LINUX_BUILD([whether dentry.d_op->d_delete takes a const argument],
[ac_cv_linux_dop_d_delete_takes_const],
[#include <linux/fs.h>
#include <linux/dcache.h>],
[struct dentry_operations _d_ops;
int _d_del(const struct dentry *de) {return 0;};
_d_ops.d_delete = _d_del;],
[DOP_D_DELETE_TAKES_CONST],
[define if dentry.d_op->d_delete takes a const argument],
[-Werror])
])