drm/nouveau/bios: implement opcode 0xa9

[karo-tx-linux.git] / fs / f2fs / namei.c

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index aec362f6f0b021ab25b5e3c28c60a585ed602bbf..89b7675dc3770e0ce6d3f6ba4616f2318191a1ce 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -1,4 +1,4 @@
-/**
+/*
  * fs/f2fs/namei.c
  *
  * Copyright (c) 2012 Samsung Electronics Co., Ltd.
@@ -96,7 +96,7 @@ static int is_multimedia_file(const unsigned char *s, const char *sub)
        return ret;
 }
 
-/**
+/*
  * Set multimedia files as cold files for hot/cold data separation
  */
 static inline void set_cold_file(struct f2fs_sb_info *sbi, struct inode *inode,
@@ -287,14 +287,13 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
        int err;
 
        inode = f2fs_new_inode(dir, S_IFDIR | mode);
-       err = PTR_ERR(inode);
        if (IS_ERR(inode))
-               return err;
+               return PTR_ERR(inode);
 
        inode->i_op = &f2fs_dir_inode_operations;
        inode->i_fop = &f2fs_dir_operations;
        inode->i_mapping->a_ops = &f2fs_dblock_aops;
-       mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS | __GFP_ZERO);
+       mapping_set_gfp_mask(inode->i_mapping, GFP_F2FS_ZERO);
 
        set_inode_flag(F2FS_I(inode), FI_INC_LINK);
        err = f2fs_add_link(dentry, inode);