This patch cleans up some warnings in the const qualifiers introduced by
the reiserfs/selinux patches.
Signed-off-by: Jeff Mahoney <[email protected]>
diff -ruNpX dontdiff linux-2.6.9/fs/reiserfs/xattr.c linux-2.6.9.selinux/fs/reiserfs/xattr.c
--- linux-2.6.9/fs/reiserfs/xattr.c 2004-11-19 14:40:53.000000000 -0500
+++ linux-2.6.9.selinux/fs/reiserfs/xattr.c 2004-11-20 18:03:57.523322224 -0500
@@ -134,7 +134,7 @@ get_xa_root (struct super_block *s)
* If flags allow, the tree to the directory may be created. If creation is
* prohibited, -ENODATA is returned. */
static struct dentry *
-open_xa_dir (const struct inode *inode, int flags)
+open_xa_dir (struct inode *inode, int flags)
{
struct dentry *xaroot, *xadir;
char namebuf[17];
@@ -193,7 +193,7 @@ open_xa_dir (const struct inode *inode,
* for the inode. If flags allow, the file is created. Otherwise, a
* valid or negative dentry, or an error is returned. */
static struct dentry *
-get_xa_file_dentry (const struct inode *inode, const char *name, int flags)
+get_xa_file_dentry (struct inode *inode, const char *name, int flags)
{
struct dentry *xadir, *xafile;
int err = 0;
@@ -244,7 +244,7 @@ out:
/* Opens a file pointer to the attribute associated with inode */
static struct file *
-open_xa_file (const struct inode *inode, const char *name, int flags)
+open_xa_file (struct inode *inode, const char *name, int flags)
{
struct dentry *xafile;
struct file *fp;
@@ -610,7 +610,7 @@ out:
* inode->i_sem: down
*/
int
-reiserfs_xattr_get (const struct inode *inode, const char *name, void *buffer,
+reiserfs_xattr_get (struct inode *inode, const char *name, void *buffer,
size_t buffer_size)
{
ssize_t err = 0;
diff -ruNpX dontdiff linux-2.6.9/include/linux/reiserfs_xattr.h linux-2.6.9.selinux/include/linux/reiserfs_xattr.h
--- linux-2.6.9/include/linux/reiserfs_xattr.h 2004-08-14 01:38:11.000000000 -0400
+++ linux-2.6.9.selinux/include/linux/reiserfs_xattr.h 2004-11-20 17:00:26.000000000 -0500
@@ -46,7 +47,7 @@ int reiserfs_permission (struct inode *i
int reiserfs_permission_locked (struct inode *inode, int mask, struct nameidata *nd);
int reiserfs_xattr_del (struct inode *, const char *);
-int reiserfs_xattr_get (const struct inode *, const char *, void *, size_t);
+int reiserfs_xattr_get (struct inode *, const char *, void *, size_t);
int reiserfs_xattr_set (struct inode *, const char *, const void *,
size_t, int);
--
Jeff Mahoney
SuSE Labs