git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
fs
/
nfsd
/
vfs.c
diff --git
a/fs/nfsd/vfs.c
b/fs/nfsd/vfs.c
index
de340ff
..
4f2cd3d
100644
(file)
--- a/
fs/nfsd/vfs.c
+++ b/
fs/nfsd/vfs.c
@@
-45,11
+45,10
@@
#endif /* CONFIG_NFSD_V3 */
#include <linux/nfsd/nfsfh.h>
#include <linux/quotaops.h>
#endif /* CONFIG_NFSD_V3 */
#include <linux/nfsd/nfsfh.h>
#include <linux/quotaops.h>
-#include <linux/dnotify.h>
-#include <linux/xattr_acl.h>
+#include <linux/fsnotify.h>
#include <linux/posix_acl.h>
#include <linux/posix_acl.h>
-#ifdef CONFIG_NFSD_V4
#include <linux/posix_acl_xattr.h>
#include <linux/posix_acl_xattr.h>
+#ifdef CONFIG_NFSD_V4
#include <linux/xattr.h>
#include <linux/nfs4.h>
#include <linux/nfs4_acl.h>
#include <linux/xattr.h>
#include <linux/nfs4.h>
#include <linux/nfs4_acl.h>
@@
-734,7
+733,7
@@
nfsd_sync(struct file *filp)
up(&inode->i_sem);
}
up(&inode->i_sem);
}
-
static
void
+void
nfsd_sync_dir(struct dentry *dp)
{
nfsd_dosync(NULL, dp, dp->d_inode->i_fop);
nfsd_sync_dir(struct dentry *dp)
{
nfsd_dosync(NULL, dp, dp->d_inode->i_fop);
@@
-861,7
+860,7
@@
nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
nfsdstats.io_read += err;
*count = err;
err = 0;
nfsdstats.io_read += err;
*count = err;
err = 0;
-
dnotify_parent(file->f_dentry, DN_ACCESS
);
+
fsnotify_access(file->f_dentry
);
} else
err = nfserrno(err);
out:
} else
err = nfserrno(err);
out:
@@
-917,7
+916,7
@@
nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
set_fs(oldfs);
if (err >= 0) {
nfsdstats.io_write += cnt;
set_fs(oldfs);
if (err >= 0) {
nfsdstats.io_write += cnt;
-
dnotify_parent(file->f_dentry, DN_MODIFY
);
+
fsnotify_modify(file->f_dentry
);
}
/* clear setuid/setgid flag after write */
}
/* clear setuid/setgid flag after write */
@@
-1872,10
+1871,10
@@
nfsd_get_posix_acl(struct svc_fh *fhp, int type)
return ERR_PTR(-EOPNOTSUPP);
switch(type) {
case ACL_TYPE_ACCESS:
return ERR_PTR(-EOPNOTSUPP);
switch(type) {
case ACL_TYPE_ACCESS:
- name =
XATTR_NAME_ACL
_ACCESS;
+ name =
POSIX_ACL_XATTR
_ACCESS;
break;
case ACL_TYPE_DEFAULT:
break;
case ACL_TYPE_DEFAULT:
- name =
XATTR_NAME_ACL
_DEFAULT;
+ name =
POSIX_ACL_XATTR
_DEFAULT;
break;
default:
return ERR_PTR(-EOPNOTSUPP);
break;
default:
return ERR_PTR(-EOPNOTSUPP);
@@
-1919,17
+1918,17
@@
nfsd_set_posix_acl(struct svc_fh *fhp, int type, struct posix_acl *acl)
return -EOPNOTSUPP;
switch(type) {
case ACL_TYPE_ACCESS:
return -EOPNOTSUPP;
switch(type) {
case ACL_TYPE_ACCESS:
- name =
XATTR_NAME_ACL
_ACCESS;
+ name =
POSIX_ACL_XATTR
_ACCESS;
break;
case ACL_TYPE_DEFAULT:
break;
case ACL_TYPE_DEFAULT:
- name =
XATTR_NAME_ACL
_DEFAULT;
+ name =
POSIX_ACL_XATTR
_DEFAULT;
break;
default:
return -EOPNOTSUPP;
}
if (acl && acl->a_count) {
break;
default:
return -EOPNOTSUPP;
}
if (acl && acl->a_count) {
- size =
xattr_acl
_size(acl->a_count);
+ size =
posix_acl_xattr
_size(acl->a_count);
value = kmalloc(size, GFP_KERNEL);
if (!value)
return -ENOMEM;
value = kmalloc(size, GFP_KERNEL);
if (!value)
return -ENOMEM;