diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2020-10-17 12:36:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2020-10-17 12:36:27 +0200 |
| commit | 887cae0a5083d67ca72016144a8e72258f41877c (patch) | |
| tree | 3dda5ca5c102298ea0144114c9c9b60026293bcf /fs | |
| parent | c7826d812d44a1ed7fd920955c4b84759eda92e5 (diff) | |
| parent | d98913ec3269a460636da0e4e8c72f594fb756c0 (diff) | |
Merge 4.4.240 into android-4.4-p
Changes in 4.4.240
Bluetooth: A2MP: Fix not initializing all members
Bluetooth: MGMT: Fix not checking if BT_HS is enabled
Bluetooth: fix kernel oops in store_pending_adv_report
Bluetooth: Consolidate encryption handling in hci_encrypt_cfm
Bluetooth: Fix update of connection state in `hci_encrypt_cfm`
Bluetooth: Disconnect if E0 is used for Level 4
media: usbtv: Fix refcounting mixup
USB: serial: option: add Cellient MPL200 card
USB: serial: option: Add Telit FT980-KS composition
staging: comedi: check validity of wMaxPacketSize of usb endpoints found
USB: serial: pl2303: add device-id for HP GC device
USB: serial: ftdi_sio: add support for FreeCalypso JTAG+UART adapters
reiserfs: Initialize inode keys properly
reiserfs: Fix oops during mount
spi: unbinding slave before calling spi_destroy_queue
crypto: qat - check cipher length for aead AES-CBC-HMAC-SHA
Linux 4.4.240
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I194dca828914f8573fbdf725f353775c934a2423
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/reiserfs/inode.c | 6 | ||||
| -rw-r--r-- | fs/reiserfs/xattr.c | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 60ba35087d12..cfb4691d9274 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -1553,11 +1553,7 @@ void reiserfs_read_locked_inode(struct inode *inode, * set version 1, version 2 could be used too, because stat data * key is the same in both versions */ - key.version = KEY_FORMAT_3_5; - key.on_disk_key.k_dir_id = dirino; - key.on_disk_key.k_objectid = inode->i_ino; - key.on_disk_key.k_offset = 0; - key.on_disk_key.k_type = 0; + _make_cpu_key(&key, KEY_FORMAT_3_5, dirino, inode->i_ino, 0, 0, 3); /* look for the object's stat data */ retval = search_item(inode->i_sb, &key, &path_to_sd); diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index d424b3d4bf3b..92d39cbc2d64 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -656,6 +656,13 @@ reiserfs_xattr_get(struct inode *inode, const char *name, void *buffer, if (get_inode_sd_version(inode) == STAT_DATA_V1) return -EOPNOTSUPP; + /* + * priv_root needn't be initialized during mount so allow initial + * lookups to succeed. + */ + if (!REISERFS_SB(inode->i_sb)->priv_root) + return 0; + dentry = xattr_lookup(inode, name, XATTR_REPLACE); if (IS_ERR(dentry)) { err = PTR_ERR(dentry); |