[RAMEN9610-8702][COMMON] fmp: remove REQ_AUX_PRIV

fmp removes useless REQ_AUX_PRIV flag

Change-Id: I262c9646d6aa60cd75f5a5fb7c6e6a39ed0e008f
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>

diff --git a/crypto/diskcipher.c b/crypto/diskcipher.c
index f6205abc277a294b9015f6193b82632ee3a438c6..812690df77027f0cab9c59d15dbc6c1153cfdeea 100644 (file)
--- a/crypto/diskcipher.c
+++ b/crypto/diskcipher.c
@@ -192,7 +192,7 @@ void crypto_diskcipher_set(struct bio *bio,
                           struct crypto_diskcipher *tfm)
 {
        if (bio && tfm) {
-               bio->bi_opf |= (REQ_CRYPT | REQ_AUX_PRIV);
+               bio->bi_opf |= REQ_CRYPT;
                bio->bi_aux_private = tfm;
        }
        crypto_diskcipher_debug(DISKC_API_SET, 0);

diff --git a/drivers/crypto/fmp/fmp_test.c b/drivers/crypto/fmp/fmp_test.c
index 58fa2d0b3aabbf95cfaf0e438135624dbcc2854a..1c808a462b7528b45fbd3b496ae3b4e680d5cf32 100644 (file)
--- a/drivers/crypto/fmp/fmp_test.c
+++ b/drivers/crypto/fmp/fmp_test.c
@@ -210,7 +210,7 @@ int fmp_cipher_run(struct exynos_fmp *fmp, struct fmp_test_data *fdata,
                /* ci is crypto_tfm_ctx(tfm) */
                bh->b_private = priv;
        }
-       op_flags = REQ_CRYPT | REQ_AUX_PRIV;
+       op_flags = REQ_CRYPT;
 
        if (write == WRITE_MODE) {
                memcpy(bh->b_data, data, len);

diff --git a/fs/buffer.c b/fs/buffer.c
index fd41645f26eb9cb11114a42f9a794d3b408076d7..f3e4e1546de71f77a31741b30ebf5f17e43ae390 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -3143,7 +3143,7 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
        bio_set_op_attrs(bio, op, op_flags);
 
        crypto_diskcipher_debug(BLK_BH, op_flags);
-       if (bio->bi_opf & REQ_AUX_PRIV)
+       if (bio->bi_opf & REQ_CRYPT)
                bio->bi_aux_private = bh->b_private;
        submit_bio(bio);
        return 0;

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index c0a350ec65c2158287d070d5f2b8599fa3d2f701..04509cf812c563826cf06cc3e62cee86a077ad39 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1223,7 +1223,7 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len,
                        if (decrypt && fscrypt_has_encryption_key(inode)) {
                                bh->b_private = fscrypt_get_diskcipher(inode);
                                if (bh->b_private) {
-                                       bi_opf |= (REQ_CRYPT | REQ_AUX_PRIV);
+                                       bi_opf |= REQ_CRYPT;
                                        decrypt = 0;
                                }
                        }

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 52a51c656cd548d71d8823f415a9353cdcda64cc..185f0d5c086db0b7193c5b60c9b43c3dfb4b6158 100644 (file)
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -229,7 +229,6 @@ enum req_flag_bits {
        __REQ_INTEGRITY,        /* I/O includes block integrity payload */
        __REQ_FUA,              /* forced unit access */
        __REQ_PREFLUSH,         /* request for cache flush */
-       __REQ_AUX_PRIV,         /* use bi_aux_private */
        __REQ_CRYPT,            /* request inline crypt */
        __REQ_RAHEAD,           /* read ahead, can fail anytime */
        __REQ_BACKGROUND,       /* background IO */
@@ -255,7 +254,6 @@ enum req_flag_bits {
 #define REQ_NOMERGE            (1ULL << __REQ_NOMERGE)
 #define REQ_IDLE               (1ULL << __REQ_IDLE)
 #define REQ_INTEGRITY          (1ULL << __REQ_INTEGRITY)
-#define REQ_AUX_PRIV           (1ULL << __REQ_AUX_PRIV)
 #define REQ_CRYPT              (1ULL << __REQ_CRYPT)
 #define REQ_FUA                        (1ULL << __REQ_FUA)
 #define REQ_PREFLUSH           (1ULL << __REQ_PREFLUSH)