OSDN Git Service

f2fs: fix build error with multiply defined inode_nohighmem()
authorGreg Kroah-Hartman <gregkh@google.com>
Wed, 21 Feb 2018 11:12:01 +0000 (12:12 +0100)
committerGreg Kroah-Hartman <gregkh@google.com>
Wed, 21 Feb 2018 11:12:01 +0000 (12:12 +0100)
Due to the merge of 4.4.116, there is a build error in f2fs due to
inode_nohighmem() being defined twice.  This patch removes the f2fs-only
instance of the function as it's no longer needed.

Bug: 72320324
Change-Id: If14f1e167498bceb2e434420181923952f7748ba
Cc: Jaegeuk Kim <jaegeuk@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
fs/f2fs/f2fs.h

index 983f4a7..d3ebe45 100644 (file)
@@ -169,11 +169,6 @@ static inline bool wq_has_sleeper(wait_queue_head_t *wq)
        return waitqueue_active(wq);
 }
 
-static inline void inode_nohighmem(struct inode *inode)
-{
-       mapping_set_gfp_mask(inode->i_mapping, GFP_USER);
-}
-
 /**
  * current_time - Return FS time
  * @inode: inode.