Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

3 files changed, 8 insertions, 10 deletions

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 83e94fedd4e9..0a50942b4378 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -282,7 +282,7 @@ static struct dentry *ecryptfs_lookup(struct inode *dir, struct dentry *dentry,
         struct dentry *lower_dentry;
         struct vfsmount *lower_mnt;
         char *encoded_name;
-        unsigned int encoded_namelen;
+        int encoded_namelen;
         struct ecryptfs_crypt_stat *crypt_stat = NULL;
         struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
         char *page_virt = NULL;
@@ -473,7 +473,7 @@ static int ecryptfs_symlink(struct inode *dir, struct dentry *dentry,
         struct dentry *lower_dir_dentry;
         umode_t mode;
         char *encoded_symname;
-        unsigned int encoded_symlen;
+        int encoded_symlen;
         struct ecryptfs_crypt_stat *crypt_stat = NULL;
 
         lower_dentry = ecryptfs_dentry_to_lower(dentry);
@@ -902,8 +902,9 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)
         mutex_lock(&crypt_stat->cs_mutex);
         if (S_ISDIR(dentry->d_inode->i_mode))
                 crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
-        else if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)
-                 || !(crypt_stat->flags & ECRYPTFS_KEY_VALID)) {
+        else if (S_ISREG(dentry->d_inode->i_mode)
+                 && (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)
+                     || !(crypt_stat->flags & ECRYPTFS_KEY_VALID))) {
                 struct vfsmount *lower_mnt;
                 struct file *lower_file = NULL;
                 struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 606128f5c927..e557a6766927 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -677,7 +677,7 @@ static int ecryptfs_init_kmem_caches(void)
 
                 info = &ecryptfs_cache_infos[i];
                 *(info->cache) = kmem_cache_create(info->name, info->size,
-                                0, SLAB_HWCACHE_ALIGN, info->ctor, NULL);
+                                0, SLAB_HWCACHE_ALIGN, info->ctor);
                 if (!*(info->cache)) {
                         ecryptfs_free_kmem_caches();
                         ecryptfs_printk(KERN_WARNING, "%s: "
@@ -840,8 +840,6 @@ static int __init ecryptfs_init(void)
                 goto out;
         }
         kobj_set_kset_s(&ecryptfs_subsys, fs_subsys);
-        sysfs_attr_version.attr.owner = THIS_MODULE;
-        sysfs_attr_version_str.attr.owner = THIS_MODULE;
         rc = do_sysfs_registration();
         if (rc) {
                 printk(KERN_ERR "sysfs registration failed\n");
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index 7d5a43cb0d5c..e4ab7bc14efe 100644
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -409,8 +409,7 @@ static int ecryptfs_prepare_write(struct file *file, struct page *page,
         if (!PageUptodate(page))
                 rc = ecryptfs_do_readpage(file, page, page->index);
         if (page->index != 0) {
-                loff_t end_of_prev_pg_pos =
-                        (((loff_t)page->index << PAGE_CACHE_SHIFT) - 1);
+                loff_t end_of_prev_pg_pos = page_offset(page) - 1;
 
                 if (end_of_prev_pg_pos > i_size_read(page->mapping->host)) {
                         rc = ecryptfs_truncate(file->f_path.dentry,
@@ -736,7 +735,7 @@ static int ecryptfs_commit_write(struct file *file, struct page *page,
                 goto out;
         }
         inode->i_blocks = lower_inode->i_blocks;
-        pos = (page->index << PAGE_CACHE_SHIFT) + to;
+        pos = page_offset(page) + to;
         if (pos > i_size_read(inode)) {
                 i_size_write(inode, pos);
                 ecryptfs_printk(KERN_DEBUG, "Expanded file size to "