projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
[linux-2.6-microblaze.git]
/
fs
/
ecryptfs
/
super.c
diff --git
a/fs/ecryptfs/super.c
b/fs/ecryptfs/super.c
index
0435886
..
f7fc286
100644
(file)
--- a/
fs/ecryptfs/super.c
+++ b/
fs/ecryptfs/super.c
@@
-118,11
+118,15
@@
void ecryptfs_init_inode(struct inode *inode, struct inode *lower_inode)
*/
static int ecryptfs_statfs(struct dentry *dentry, struct kstatfs *buf)
{
*/
static int ecryptfs_statfs(struct dentry *dentry, struct kstatfs *buf)
{
- return vfs_statfs(ecryptfs_dentry_to_lower(dentry), buf);
+ struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
+
+ if (!lower_dentry->d_sb->s_op->statfs)
+ return -ENOSYS;
+ return lower_dentry->d_sb->s_op->statfs(lower_dentry, buf);
}
/**
}
/**
- * ecryptfs_
clear
_inode
+ * ecryptfs_
evict
_inode
* @inode - The ecryptfs inode
*
* Called by iput() when the inode reference count reached zero
* @inode - The ecryptfs inode
*
* Called by iput() when the inode reference count reached zero
@@
-131,8
+135,10
@@
static int ecryptfs_statfs(struct dentry *dentry, struct kstatfs *buf)
* on the inode free list. We use this to drop out reference to the
* lower inode.
*/
* on the inode free list. We use this to drop out reference to the
* lower inode.
*/
-static void ecryptfs_
clear
_inode(struct inode *inode)
+static void ecryptfs_
evict
_inode(struct inode *inode)
{
{
+ truncate_inode_pages(&inode->i_data, 0);
+ end_writeback(inode);
iput(ecryptfs_inode_to_lower(inode));
}
iput(ecryptfs_inode_to_lower(inode));
}
@@
-184,6
+190,6
@@
const struct super_operations ecryptfs_sops = {
.drop_inode = generic_delete_inode,
.statfs = ecryptfs_statfs,
.remount_fs = NULL,
.drop_inode = generic_delete_inode,
.statfs = ecryptfs_statfs,
.remount_fs = NULL,
- .
clear_inode = ecryptfs_clear
_inode,
+ .
evict_inode = ecryptfs_evict
_inode,
.show_options = ecryptfs_show_options
};
.show_options = ecryptfs_show_options
};