projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] qla2xxx: Resync with latest released ISP23xx/63xx firmware -- 3.03.18.
[powerpc.git]
/
fs
/
nfsd
/
vfs.c
diff --git
a/fs/nfsd/vfs.c
b/fs/nfsd/vfs.c
index
be24ead
..
4f2cd3d
100644
(file)
--- a/
fs/nfsd/vfs.c
+++ b/
fs/nfsd/vfs.c
@@
-45,7
+45,7
@@
#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/
d
notify.h>
+#include <linux/
fs
notify.h>
#include <linux/posix_acl.h>
#include <linux/posix_acl_xattr.h>
#ifdef CONFIG_NFSD_V4
#include <linux/posix_acl.h>
#include <linux/posix_acl_xattr.h>
#ifdef CONFIG_NFSD_V4
@@
-733,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);
@@
-860,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:
@@
-916,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 */