From: Miklos Szeredi <mszeredi@xxxxxxx>
reiserfs_delete_xattrs() calls vfs_rmdir() to remove the private
directory associated with the extended attributes for an inode.
Replace with explicit call to reiserfs_rmdir().
The extended attribute files reside in a private directory, completely
inaccessible from userspace. This means, that checking against mounts
on the dentry is not necessary.
The calls to may_delete() and security_inode_rmdir(), as performed by
vfs_rmdir() are also unecessary for this case.
Based on patch by Jeff Mahoney.
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
Acked-by: Jeff Mahoney <jeffm@xxxxxxx>
---
fs/reiserfs/namei.c | 2 +-
fs/reiserfs/xattr.c | 22 +++++++++++++++++++++-
include/linux/reiserfs_fs.h | 1 +
3 files changed, 23 insertions(+), 2 deletions(-)
Index: linux-2.6/fs/reiserfs/xattr.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/xattr.c 2008-05-06 11:04:29.000000000 +0200
+++ linux-2.6/fs/reiserfs/xattr.c 2008-05-06 11:04:33.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/namei.h>
#include <linux/errno.h>
#include <linux/fs.h>
+#include <linux/quotaops.h>
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
@@ -712,6 +713,25 @@ reiserfs_delete_xattrs_filler(void *buf,
}
+static int xattr_rmdir(struct inode *dir, struct dentry *dentry)
+{
+ int error;
+
+ DQUOT_INIT(dir);
+
+ mutex_lock_nested(&dentry->d_inode->i_mutex, I_MUTEX_CHILD);
+ dentry_unhash(dentry);
+ error = reiserfs_rmdir(dir, dentry);
+ if (!error)
+ dentry->d_inode->i_flags |= S_DEAD;
+ mutex_unlock(&dentry->d_inode->i_mutex);
+ if (!error)
+ d_delete(dentry);
+ dput(dentry);
+
+ return error;
+}
+
/* This is called w/ inode->i_mutex downed */
int reiserfs_delete_xattrs(struct inode *inode)
{
@@ -746,7 +766,7 @@ int reiserfs_delete_xattrs(struct inode
if (dir->d_inode->i_nlink <= 2) {
root = get_xa_root(inode->i_sb, XATTR_REPLACE);
reiserfs_write_lock_xattrs(inode->i_sb);
- err = vfs_rmdir(root->d_inode, dir);
+ err = xattr_rmdir(root->d_inode, dir);
reiserfs_write_unlock_xattrs(inode->i_sb);
dput(root);
} else {
Index: linux-2.6/fs/reiserfs/namei.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/namei.c 2008-05-06 11:04:29.000000000 +0200
+++ linux-2.6/fs/reiserfs/namei.c 2008-05-06 11:04:33.000000000 +0200
@@ -850,7 +850,7 @@ static inline int reiserfs_empty_dir(str
return 1;
}
-static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
+int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
{
int retval, err;
struct inode *inode;
Index: linux-2.6/include/linux/reiserfs_fs.h
===================================================================
--- linux-2.6.orig/include/linux/reiserfs_fs.h 2008-05-06 11:04:29.000000000 +0200
+++ linux-2.6/include/linux/reiserfs_fs.h 2008-05-06 11:04:33.000000000 +0200
@@ -1911,6 +1911,7 @@ static inline void reiserfs_update_sd(st
void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);
void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs);
int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
+int reiserfs_rmdir(struct inode *dir, struct dentry *dentry);
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
--
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
