Changes in 4.9.207 arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator usb: gadget: u_serial: add missing port entry locking tty: serial: fsl_lpuart: use the sg count from dma_map_sg tty: serial: msm_serial: Fix flow control serial: pl011: Fix DMA ->flush_buffer() serial: serial_core: Perform NULL checks for break_ctl ops serial: ifx6x60: add missed pm_runtime_disable autofs: fix a leak in autofs_expire_indirect() RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN exportfs_decode_fh(): negative pinned may become positive without the parent locked audit_get_nd(): don't unlock parent too early NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error Input: cyttsp4_core - fix use after free bug ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed() rsxx: add missed destroy_workqueue calls in remove net: ep93xx_eth: fix mismatch of request_mem_region in remove serial: core: Allow processing sysrq at port unlock time cxgb4vf: fix memleak in mac_hlist initialization iwlwifi: mvm: Send non offchannel traffic via AP sta ARM: 8813/1: Make aligned 2-byte getuser()/putuser() atomic on ARMv6+ net/mlx5: Release resource on error flow extcon: max8997: Fix lack of path setting in USB device mode clk: rockchip: fix rk3188 sclk_smc gate data clk: rockchip: fix rk3188 sclk_mac_lbtest parameter ordering ARM: dts: rockchip: Fix rk3288-rock2 vcc_flash name dlm: fix missing idr_destroy for recover_idr MIPS: SiByte: Enable ZONE_DMA32 for LittleSur scsi: zfcp: drop default switch case which might paper over missing case pinctrl: qcom: ssbi-gpio: fix gpio-hog related boot issues Staging: iio: adt7316: Fix i2c data reading, set the data field regulator: Fix return value of _set_load() stub MIPS: OCTEON: octeon-platform: fix typing math-emu/soft-fp.h: (_FP_ROUND_ZERO) cast 0 to void to fix warning rtc: max8997: Fix the returned value in case of error in 'max8997_rtc_read_alarm()' rtc: dt-binding: abx80x: fix resistance scale ARM: dts: exynos: Use Samsung SoC specific compatible for DWC2 module media: pulse8-cec: return 0 when invalidating the logical address dmaengine: coh901318: Fix a double-lock bug dmaengine: coh901318: Remove unused variable usb: dwc3: don't log probe deferrals; but do log other error codes ACPI: fix acpi_find_child_device() invocation in acpi_preset_companion() dma-mapping: fix return type of dma_set_max_seg_size() altera-stapl: check for a null key before strcasecmp'ing it serial: imx: fix error handling in console_setup i2c: imx: don't print error message on probe defer dlm: NULL check before kmem_cache_destroy is not needed ARM: debug: enable UART1 for socfpga Cyclone5 nfsd: fix a warning in __cld_pipe_upcall() ARM: OMAP1/2: fix SoC name printing net/x25: fix called/calling length calculation in x25_parse_address_block net/x25: fix null_x25_address handling ARM: dts: mmp2: fix the gpio interrupt cell number ARM: dts: realview-pbx: Fix duplicate regulator nodes tcp: fix off-by-one bug on aborting window-probing socket tcp: fix SNMP TCP timeout under-estimation modpost: skip ELF local symbols during section mismatch check kbuild: fix single target build for external module mtd: fix mtd_oobavail() incoherent returned value ARM: dts: pxa: clean up USB controller nodes clk: sunxi-ng: h3/h5: Fix CSI_MCLK parent ARM: dts: realview: Fix some more duplicate regulator nodes dlm: fix invalid cluster name warning net/mlx4_core: Fix return codes of unsupported operations powerpc/math-emu: Update macros from GCC MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible definition nfsd: Return EPERM, not EACCES, in some SETATTR cases tty: Don't block on IO when ldisc change is pending media: stkwebcam: Bugfix for wrong return values mlx4: Use snprintf instead of complicated strcpy ARM: dts: sunxi: Fix PMU compatible strings sched/fair: Scale bandwidth quota and period without losing quota/period ratio precision fuse: verify nlink fuse: verify attributes ALSA: pcm: oss: Avoid potential buffer overflows Input: goodix - add upside-down quirk for Teclast X89 tablet coresight: etm4x: Fix input validation for sysfs. x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks CIFS: Fix SMB2 oplock break processing tty: vt: keyboard: reject invalid keycodes can: slcan: Fix use-after-free Read in slcan_open jbd2: Fix possible overflow in jbd2_log_space_left() drm/i810: Prevent underflow in ioctl KVM: x86: do not modify masked bits of shared MSRs KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr crypto: ccp - fix uninitialized list head crypto: ecdh - fix big endian bug in ECC library crypto: user - fix memory leak in crypto_report spi: atmel: Fix CS high support RDMA/qib: Validate ->show()/store() callbacks before calling them thermal: Fix deadlock in thermal thermal_zone_device_check KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332) appletalk: Fix potential NULL pointer dereference in unregister_snap_client appletalk: Set error code if register_snap_client failed usb: gadget: configfs: Fix missing spin_lock_init() USB: uas: honor flag to avoid CAPACITY16 USB: uas: heed CAPACITY_HEURISTICS usb: Allow USB device to be warm reset in suspended state staging: rtl8188eu: fix interface sanity check staging: rtl8712: fix interface sanity check staging: gigaset: fix general protection fault on probe staging: gigaset: fix illegal free on probe errors staging: gigaset: add endpoint-type sanity check xhci: Increase STS_HALT timeout in xhci_suspend() ARM: dts: pandora-common: define wl1251 as child node of mmc3 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting USB: atm: ueagle-atm: add missing endpoint check USB: idmouse: fix interface sanity checks USB: serial: io_edgeport: fix epic endpoint lookup USB: adutux: fix interface sanity check usb: core: urb: fix URB structure initialization function usb: mon: Fix a deadlock in usbmon between mmap and read mtd: spear_smi: Fix Write Burst mode virtio-balloon: fix managed page counts when migrating pages between zones btrfs: check page->mapping when loading free space cache btrfs: Remove btrfs_bio::flags member Btrfs: send, skip backreference walking for extents with many references btrfs: record all roots for rename exchange on a subvol rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer rtlwifi: rtl8192de: Fix missing enable interrupt flag lib: raid6: fix awk build warnings ALSA: hda - Fix pending unsol events at shutdown workqueue: Fix spurious sanity check failures in destroy_workqueue() workqueue: Fix pwq ref leak in rescuer_thread() ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report blk-mq: avoid sysfs buffer overflow with too many CPU cores cgroup: pids: use atomic64_t for pids->limit ar5523: check NULL before memcpy() in ar5523_cmd() media: bdisp: fix memleak on release media: radio: wl1273: fix interrupt masking on release cpuidle: Do not unset the driver if it is there already PM / devfreq: Lock devfreq in trans_stat_show ACPI: OSL: only free map once in osl.c ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data() ACPI: PM: Avoid attaching ACPI PM domain to certain devices pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init pinctrl: samsung: Fix device node refcount leaks in init code mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card ppdev: fix PPGETTIME/PPSETTIME ioctls powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB video/hdmi: Fix AVI bar unpack quota: Check that quota is not dirty before release ext2: check err when partial != NULL quota: fix livelock in dquot_writeback_dquots scsi: zfcp: trace channel log even for FCP command responses usb: xhci: only set D3hot for pci device xhci: Fix memory leak in xhci_add_in_port() xhci: make sure interrupts are restored to correct state iio: adis16480: Add debugfs_reg_access entry Btrfs: fix negative subv_writers counter and data space leak after buffered write omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 scsi: lpfc: Cap NPIV vports to 256 e100: Fix passing zero to 'PTR_ERR' warning in e100_load_ucode_wait x86/MCE/AMD: Turn off MC4_MISC thresholding on all family 0x15 models x86/MCE/AMD: Carve out the MC4_MISC thresholding quirk ath10k: fix fw crash by moving chip reset after napi disabled ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init scsi: qla2xxx: Fix DMA unmap leak scsi: qla2xxx: Fix session lookup in qlt_abort_work() scsi: qla2xxx: Fix qla24xx_process_bidir_cmd() scsi: qla2xxx: Always check the qla2x00_wait_for_hba_online() return value powerpc: Fix vDSO clock_getres() reiserfs: fix extended attributes on the root directory firmware: qcom: scm: Ensure 'a0' status code is treated as signed mm/shmem.c: cast the type of unmap_start to u64 ext4: fix a bug in ext4_wait_for_tail_page_commit blk-mq: make sure that line break can be printed workqueue: Fix missing kfree(rescuer) in destroy_workqueue() sunrpc: fix crash when cache_head become valid before update net/mlx5e: Fix SFF 8472 eeprom length kernel/module.c: wakeup processes in module_wq on module unload nvme: host: core: fix precedence of ternary operator net: bridge: deny dev_set_mac_address() when unregistering net: ethernet: ti: cpsw: fix extra rx interrupt openvswitch: support asymmetric conntrack tcp: md5: fix potential overestimation of TCP option space tipc: fix ordering of tipc module init and exit routine inet: protect against too small mtu values. tcp: fix rejected syncookies due to stale timestamps tcp: tighten acceptance of ACKs not matching a child socket tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE() Revert "regulator: Defer init completion for a while after late_initcall" PCI: Fix Intel ACS quirk UPDCR register address PCI/MSI: Fix incorrect MSI-X masking on resume xtensa: fix TLB sanity checker CIFS: Respect O_SYNC and O_DIRECT flags during reconnect ARM: dts: s3c64xx: Fix init order of clock providers ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() vfio/pci: call irq_bypass_unregister_producer() before freeing irq dma-buf: Fix memory leak in sync_file_merge() dm btree: increase rebalance threshold in __rebalance2() scsi: iscsi: Fix a potential deadlock in the timeout handler drm/radeon: fix r1xx/r2xx register checker for POT textures xhci: fix USB3 device initiated resume race with roothub autosuspend net: stmmac: use correct DMA buffer size in the RX descriptor net: stmmac: don't stop NAPI processing when dropping a packet Linux 4.9.207 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
400 lines
9.4 KiB
C
400 lines
9.4 KiB
C
#include <linux/capability.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/posix_acl.h>
|
|
#include "reiserfs.h"
|
|
#include <linux/errno.h>
|
|
#include <linux/pagemap.h>
|
|
#include <linux/xattr.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/posix_acl_xattr.h>
|
|
#include "xattr.h"
|
|
#include "acl.h"
|
|
#include <linux/uaccess.h>
|
|
|
|
static int __reiserfs_set_acl(struct reiserfs_transaction_handle *th,
|
|
struct inode *inode, int type,
|
|
struct posix_acl *acl);
|
|
|
|
|
|
int
|
|
reiserfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
|
|
{
|
|
int error, error2;
|
|
struct reiserfs_transaction_handle th;
|
|
size_t jcreate_blocks;
|
|
int size = acl ? posix_acl_xattr_size(acl->a_count) : 0;
|
|
|
|
|
|
/*
|
|
* Pessimism: We can't assume that anything from the xattr root up
|
|
* has been created.
|
|
*/
|
|
|
|
jcreate_blocks = reiserfs_xattr_jcreate_nblocks(inode) +
|
|
reiserfs_xattr_nblocks(inode, size) * 2;
|
|
|
|
reiserfs_write_lock(inode->i_sb);
|
|
error = journal_begin(&th, inode->i_sb, jcreate_blocks);
|
|
reiserfs_write_unlock(inode->i_sb);
|
|
if (error == 0) {
|
|
if (type == ACL_TYPE_ACCESS && acl) {
|
|
error = posix_acl_update_mode(inode, &inode->i_mode,
|
|
&acl);
|
|
if (error)
|
|
goto unlock;
|
|
}
|
|
error = __reiserfs_set_acl(&th, inode, type, acl);
|
|
unlock:
|
|
reiserfs_write_lock(inode->i_sb);
|
|
error2 = journal_end(&th);
|
|
reiserfs_write_unlock(inode->i_sb);
|
|
if (error2)
|
|
error = error2;
|
|
}
|
|
|
|
return error;
|
|
}
|
|
|
|
/*
|
|
* Convert from filesystem to in-memory representation.
|
|
*/
|
|
static struct posix_acl *reiserfs_posix_acl_from_disk(const void *value, size_t size)
|
|
{
|
|
const char *end = (char *)value + size;
|
|
int n, count;
|
|
struct posix_acl *acl;
|
|
|
|
if (!value)
|
|
return NULL;
|
|
if (size < sizeof(reiserfs_acl_header))
|
|
return ERR_PTR(-EINVAL);
|
|
if (((reiserfs_acl_header *) value)->a_version !=
|
|
cpu_to_le32(REISERFS_ACL_VERSION))
|
|
return ERR_PTR(-EINVAL);
|
|
value = (char *)value + sizeof(reiserfs_acl_header);
|
|
count = reiserfs_acl_count(size);
|
|
if (count < 0)
|
|
return ERR_PTR(-EINVAL);
|
|
if (count == 0)
|
|
return NULL;
|
|
acl = posix_acl_alloc(count, GFP_NOFS);
|
|
if (!acl)
|
|
return ERR_PTR(-ENOMEM);
|
|
for (n = 0; n < count; n++) {
|
|
reiserfs_acl_entry *entry = (reiserfs_acl_entry *) value;
|
|
if ((char *)value + sizeof(reiserfs_acl_entry_short) > end)
|
|
goto fail;
|
|
acl->a_entries[n].e_tag = le16_to_cpu(entry->e_tag);
|
|
acl->a_entries[n].e_perm = le16_to_cpu(entry->e_perm);
|
|
switch (acl->a_entries[n].e_tag) {
|
|
case ACL_USER_OBJ:
|
|
case ACL_GROUP_OBJ:
|
|
case ACL_MASK:
|
|
case ACL_OTHER:
|
|
value = (char *)value +
|
|
sizeof(reiserfs_acl_entry_short);
|
|
break;
|
|
|
|
case ACL_USER:
|
|
value = (char *)value + sizeof(reiserfs_acl_entry);
|
|
if ((char *)value > end)
|
|
goto fail;
|
|
acl->a_entries[n].e_uid =
|
|
make_kuid(&init_user_ns,
|
|
le32_to_cpu(entry->e_id));
|
|
break;
|
|
case ACL_GROUP:
|
|
value = (char *)value + sizeof(reiserfs_acl_entry);
|
|
if ((char *)value > end)
|
|
goto fail;
|
|
acl->a_entries[n].e_gid =
|
|
make_kgid(&init_user_ns,
|
|
le32_to_cpu(entry->e_id));
|
|
break;
|
|
|
|
default:
|
|
goto fail;
|
|
}
|
|
}
|
|
if (value != end)
|
|
goto fail;
|
|
return acl;
|
|
|
|
fail:
|
|
posix_acl_release(acl);
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
/*
|
|
* Convert from in-memory to filesystem representation.
|
|
*/
|
|
static void *reiserfs_posix_acl_to_disk(const struct posix_acl *acl, size_t * size)
|
|
{
|
|
reiserfs_acl_header *ext_acl;
|
|
char *e;
|
|
int n;
|
|
|
|
*size = reiserfs_acl_size(acl->a_count);
|
|
ext_acl = kmalloc(sizeof(reiserfs_acl_header) +
|
|
acl->a_count *
|
|
sizeof(reiserfs_acl_entry),
|
|
GFP_NOFS);
|
|
if (!ext_acl)
|
|
return ERR_PTR(-ENOMEM);
|
|
ext_acl->a_version = cpu_to_le32(REISERFS_ACL_VERSION);
|
|
e = (char *)ext_acl + sizeof(reiserfs_acl_header);
|
|
for (n = 0; n < acl->a_count; n++) {
|
|
const struct posix_acl_entry *acl_e = &acl->a_entries[n];
|
|
reiserfs_acl_entry *entry = (reiserfs_acl_entry *) e;
|
|
entry->e_tag = cpu_to_le16(acl->a_entries[n].e_tag);
|
|
entry->e_perm = cpu_to_le16(acl->a_entries[n].e_perm);
|
|
switch (acl->a_entries[n].e_tag) {
|
|
case ACL_USER:
|
|
entry->e_id = cpu_to_le32(
|
|
from_kuid(&init_user_ns, acl_e->e_uid));
|
|
e += sizeof(reiserfs_acl_entry);
|
|
break;
|
|
case ACL_GROUP:
|
|
entry->e_id = cpu_to_le32(
|
|
from_kgid(&init_user_ns, acl_e->e_gid));
|
|
e += sizeof(reiserfs_acl_entry);
|
|
break;
|
|
|
|
case ACL_USER_OBJ:
|
|
case ACL_GROUP_OBJ:
|
|
case ACL_MASK:
|
|
case ACL_OTHER:
|
|
e += sizeof(reiserfs_acl_entry_short);
|
|
break;
|
|
|
|
default:
|
|
goto fail;
|
|
}
|
|
}
|
|
return (char *)ext_acl;
|
|
|
|
fail:
|
|
kfree(ext_acl);
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
/*
|
|
* Inode operation get_posix_acl().
|
|
*
|
|
* inode->i_mutex: down
|
|
* BKL held [before 2.5.x]
|
|
*/
|
|
struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
|
|
{
|
|
char *name, *value;
|
|
struct posix_acl *acl;
|
|
int size;
|
|
int retval;
|
|
|
|
switch (type) {
|
|
case ACL_TYPE_ACCESS:
|
|
name = XATTR_NAME_POSIX_ACL_ACCESS;
|
|
break;
|
|
case ACL_TYPE_DEFAULT:
|
|
name = XATTR_NAME_POSIX_ACL_DEFAULT;
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
|
|
size = reiserfs_xattr_get(inode, name, NULL, 0);
|
|
if (size < 0) {
|
|
if (size == -ENODATA || size == -ENOSYS)
|
|
return NULL;
|
|
return ERR_PTR(size);
|
|
}
|
|
|
|
value = kmalloc(size, GFP_NOFS);
|
|
if (!value)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
retval = reiserfs_xattr_get(inode, name, value, size);
|
|
if (retval == -ENODATA || retval == -ENOSYS) {
|
|
/*
|
|
* This shouldn't actually happen as it should have
|
|
* been caught above.. but just in case
|
|
*/
|
|
acl = NULL;
|
|
} else if (retval < 0) {
|
|
acl = ERR_PTR(retval);
|
|
} else {
|
|
acl = reiserfs_posix_acl_from_disk(value, retval);
|
|
}
|
|
|
|
kfree(value);
|
|
return acl;
|
|
}
|
|
|
|
/*
|
|
* Inode operation set_posix_acl().
|
|
*
|
|
* inode->i_mutex: down
|
|
* BKL held [before 2.5.x]
|
|
*/
|
|
static int
|
|
__reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
|
|
int type, struct posix_acl *acl)
|
|
{
|
|
char *name;
|
|
void *value = NULL;
|
|
size_t size = 0;
|
|
int error;
|
|
|
|
switch (type) {
|
|
case ACL_TYPE_ACCESS:
|
|
name = XATTR_NAME_POSIX_ACL_ACCESS;
|
|
break;
|
|
case ACL_TYPE_DEFAULT:
|
|
name = XATTR_NAME_POSIX_ACL_DEFAULT;
|
|
if (!S_ISDIR(inode->i_mode))
|
|
return acl ? -EACCES : 0;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (acl) {
|
|
value = reiserfs_posix_acl_to_disk(acl, &size);
|
|
if (IS_ERR(value))
|
|
return (int)PTR_ERR(value);
|
|
}
|
|
|
|
error = reiserfs_xattr_set_handle(th, inode, name, value, size, 0);
|
|
|
|
/*
|
|
* Ensure that the inode gets dirtied if we're only using
|
|
* the mode bits and an old ACL didn't exist. We don't need
|
|
* to check if the inode is hashed here since we won't get
|
|
* called by reiserfs_inherit_default_acl().
|
|
*/
|
|
if (error == -ENODATA) {
|
|
error = 0;
|
|
if (type == ACL_TYPE_ACCESS) {
|
|
inode->i_ctime = current_time(inode);
|
|
mark_inode_dirty(inode);
|
|
}
|
|
}
|
|
|
|
kfree(value);
|
|
|
|
if (!error)
|
|
set_cached_acl(inode, type, acl);
|
|
|
|
return error;
|
|
}
|
|
|
|
/*
|
|
* dir->i_mutex: locked,
|
|
* inode is new and not released into the wild yet
|
|
*/
|
|
int
|
|
reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,
|
|
struct inode *dir, struct dentry *dentry,
|
|
struct inode *inode)
|
|
{
|
|
struct posix_acl *default_acl, *acl;
|
|
int err = 0;
|
|
|
|
/* ACLs only get applied to files and directories */
|
|
if (S_ISLNK(inode->i_mode))
|
|
return 0;
|
|
|
|
/*
|
|
* ACLs can only be used on "new" objects, so if it's an old object
|
|
* there is nothing to inherit from
|
|
*/
|
|
if (get_inode_sd_version(dir) == STAT_DATA_V1)
|
|
goto apply_umask;
|
|
|
|
/*
|
|
* Don't apply ACLs to objects in the .reiserfs_priv tree.. This
|
|
* would be useless since permissions are ignored, and a pain because
|
|
* it introduces locking cycles
|
|
*/
|
|
if (IS_PRIVATE(inode))
|
|
goto apply_umask;
|
|
|
|
err = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
|
|
if (err)
|
|
return err;
|
|
|
|
if (default_acl) {
|
|
err = __reiserfs_set_acl(th, inode, ACL_TYPE_DEFAULT,
|
|
default_acl);
|
|
posix_acl_release(default_acl);
|
|
}
|
|
if (acl) {
|
|
if (!err)
|
|
err = __reiserfs_set_acl(th, inode, ACL_TYPE_ACCESS,
|
|
acl);
|
|
posix_acl_release(acl);
|
|
}
|
|
|
|
return err;
|
|
|
|
apply_umask:
|
|
/* no ACL, apply umask */
|
|
inode->i_mode &= ~current_umask();
|
|
return err;
|
|
}
|
|
|
|
/* This is used to cache the default acl before a new object is created.
|
|
* The biggest reason for this is to get an idea of how many blocks will
|
|
* actually be required for the create operation if we must inherit an ACL.
|
|
* An ACL write can add up to 3 object creations and an additional file write
|
|
* so we'd prefer not to reserve that many blocks in the journal if we can.
|
|
* It also has the advantage of not loading the ACL with a transaction open,
|
|
* this may seem silly, but if the owner of the directory is doing the
|
|
* creation, the ACL may not be loaded since the permissions wouldn't require
|
|
* it.
|
|
* We return the number of blocks required for the transaction.
|
|
*/
|
|
int reiserfs_cache_default_acl(struct inode *inode)
|
|
{
|
|
struct posix_acl *acl;
|
|
int nblocks = 0;
|
|
|
|
if (IS_PRIVATE(inode))
|
|
return 0;
|
|
|
|
acl = get_acl(inode, ACL_TYPE_DEFAULT);
|
|
|
|
if (acl && !IS_ERR(acl)) {
|
|
int size = reiserfs_acl_size(acl->a_count);
|
|
|
|
/* Other xattrs can be created during inode creation. We don't
|
|
* want to claim too many blocks, so we check to see if we
|
|
* we need to create the tree to the xattrs, and then we
|
|
* just want two files. */
|
|
nblocks = reiserfs_xattr_jcreate_nblocks(inode);
|
|
nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode->i_sb);
|
|
|
|
REISERFS_I(inode)->i_flags |= i_has_xattr_dir;
|
|
|
|
/* We need to account for writes + bitmaps for two files */
|
|
nblocks += reiserfs_xattr_nblocks(inode, size) * 4;
|
|
posix_acl_release(acl);
|
|
}
|
|
|
|
return nblocks;
|
|
}
|
|
|
|
/*
|
|
* Called under i_mutex
|
|
*/
|
|
int reiserfs_acl_chmod(struct inode *inode)
|
|
{
|
|
if (IS_PRIVATE(inode))
|
|
return 0;
|
|
if (get_inode_sd_version(inode) == STAT_DATA_V1 ||
|
|
!reiserfs_posixacl(inode->i_sb))
|
|
return 0;
|
|
|
|
return posix_acl_chmod(inode, inode->i_mode);
|
|
}
|