Convert ERR_PTR(PTR_ERR(p)) instances to ERR_CAST(p)

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / vfat / namei.c

diff --git a/fs/vfat/namei.c b/fs/vfat/namei.c
index edb711ff7b05781b624b310dcf7b360f2c683745..cd450bea9f1a179220364e9d42e48561a4d860a1 100644 (file)
--- a/fs/vfat/namei.c
+++ b/fs/vfat/namei.c
@@ -705,7 +705,7 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry,
        brelse(sinfo.bh);
        if (IS_ERR(inode)) {
                unlock_kernel();
-               return ERR_PTR(PTR_ERR(inode));
+               return ERR_CAST(inode);
        }
        alias = d_find_alias(inode);
        if (alias) {
@@ -996,7 +996,7 @@ error_inode:
        goto out;
 }
 
-static struct inode_operations vfat_dir_inode_operations = {
+static const struct inode_operations vfat_dir_inode_operations = {
        .create         = vfat_create,
        .lookup         = vfat_lookup,
        .unlink         = vfat_unlink,
@@ -1004,6 +1004,7 @@ static struct inode_operations vfat_dir_inode_operations = {
        .rmdir          = vfat_rmdir,
        .rename         = vfat_rename,
        .setattr        = fat_notify_change,
+       .getattr        = fat_getattr,
 };
 
 static int vfat_fill_super(struct super_block *sb, void *data, int silent)