lkml.org 
[lkml]   [2008]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch 10/10] vfs: add path_removexattr()
From: Miklos Szeredi <mszeredi@suse.cz>

Introduce path_removexattr(). Make vfs_removexattr() static.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---
fs/nfsd/vfs.c | 6 +-----
fs/xattr.c | 41 +++++++++++++++++++----------------------
include/linux/xattr.h | 2 +-
3 files changed, 21 insertions(+), 28 deletions(-)

Index: linux-2.6/fs/nfsd/vfs.c
===================================================================
--- linux-2.6.orig/fs/nfsd/vfs.c 2008-05-05 11:29:33.000000000 +0200
+++ linux-2.6/fs/nfsd/vfs.c 2008-05-05 11:29:33.000000000 +0200
@@ -2071,9 +2071,6 @@ nfsd_set_posix_acl(struct svc_fh *fhp, i
} else
size = 0;

- error = mnt_want_write(fhp->fh_export->ex_path.mnt);
- if (error)
- goto getout;
fh_to_path(fhp, &path);
if (size)
error = path_setxattr(&path, name, value, size, 0);
@@ -2081,12 +2078,11 @@ nfsd_set_posix_acl(struct svc_fh *fhp, i
if (!S_ISDIR(inode->i_mode) && type == ACL_TYPE_DEFAULT)
error = 0;
else {
- error = vfs_removexattr(fhp->fh_dentry, name);
+ error = path_removexattr(&path, name);
if (error == -ENODATA)
error = 0;
}
}
- mnt_drop_write(fhp->fh_export->ex_path.mnt);

getout:
kfree(value);
Index: linux-2.6/fs/xattr.c
===================================================================
--- linux-2.6.orig/fs/xattr.c 2008-05-05 11:29:33.000000000 +0200
+++ linux-2.6/fs/xattr.c 2008-05-05 11:29:33.000000000 +0200
@@ -199,7 +199,7 @@ vfs_listxattr(struct dentry *d, char *li
}
EXPORT_SYMBOL_GPL(vfs_listxattr);

-int
+static int
vfs_removexattr(struct dentry *dentry, const char *name)
{
struct inode *inode = dentry->d_inode;
@@ -224,8 +224,19 @@ vfs_removexattr(struct dentry *dentry, c
fsnotify_xattr(dentry);
return error;
}
-EXPORT_SYMBOL_GPL(vfs_removexattr);

+int path_removexattr(struct path *path, const char *name)
+{
+ int error = mnt_want_write(path->mnt);
+
+ if (!error) {
+ error = vfs_removexattr(path->dentry, name);
+ mnt_drop_write(path->mnt);
+ }
+
+ return error;
+}
+EXPORT_SYMBOL(path_removexattr);

/*
* Extended attribute SET operations
@@ -471,7 +482,7 @@ sys_flistxattr(int fd, char __user *list
* Extended attribute REMOVE operations
*/
static long
-removexattr(struct dentry *d, const char __user *name)
+removexattr(struct path *path, const char __user *name)
{
int error;
char kname[XATTR_NAME_MAX + 1];
@@ -482,7 +493,7 @@ removexattr(struct dentry *d, const char
if (error < 0)
return error;

- return vfs_removexattr(d, kname);
+ return path_removexattr(path, kname);
}

asmlinkage long
@@ -494,11 +505,7 @@ sys_removexattr(const char __user *path,
error = user_path_walk(path, &nd);
if (error)
return error;
- error = mnt_want_write(nd.path.mnt);
- if (!error) {
- error = removexattr(nd.path.dentry, name);
- mnt_drop_write(nd.path.mnt);
- }
+ error = removexattr(&nd.path, name);
path_put(&nd.path);
return error;
}
@@ -512,11 +519,7 @@ sys_lremovexattr(const char __user *path
error = user_path_walk_link(path, &nd);
if (error)
return error;
- error = mnt_want_write(nd.path.mnt);
- if (!error) {
- error = removexattr(nd.path.dentry, name);
- mnt_drop_write(nd.path.mnt);
- }
+ error = removexattr(&nd.path, name);
path_put(&nd.path);
return error;
}
@@ -525,19 +528,13 @@ asmlinkage long
sys_fremovexattr(int fd, const char __user *name)
{
struct file *f;
- struct dentry *dentry;
int error = -EBADF;

f = fget(fd);
if (!f)
return error;
- dentry = f->f_path.dentry;
- audit_inode(NULL, dentry);
- error = mnt_want_write(f->f_path.mnt);
- if (!error) {
- error = removexattr(dentry, name);
- mnt_drop_write(f->f_path.mnt);
- }
+ audit_inode(NULL, f->f_path.dentry);
+ error = removexattr(&f->f_path, name);
fput(f);
return error;
}
Index: linux-2.6/include/linux/xattr.h
===================================================================
--- linux-2.6.orig/include/linux/xattr.h 2008-05-05 11:29:33.000000000 +0200
+++ linux-2.6/include/linux/xattr.h 2008-05-05 11:29:33.000000000 +0200
@@ -51,7 +51,7 @@ ssize_t xattr_getsecurity(struct inode *
ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
int path_setxattr(struct path *, const char *, const void *, size_t, int);
-int vfs_removexattr(struct dentry *, const char *);
+int path_removexattr(struct path *, const char *);

ssize_t generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size);
ssize_t generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size);
--


\
 
 \ /
  Last update: 2008-05-05 12:23    [W:0.062 / U:15.788 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site